Skip to content

Commit 28cc211

Browse files
auto-submit[bot]auto-submit[bot]
andauthored
Reverts "Fix regression in NDK version checking (flutter#166998)" (flutter#167007)
<!-- start_original_pr_link --> Reverts: flutter#166998 <!-- end_original_pr_link --> <!-- start_initiating_author --> Initiated by: gmackall <!-- end_initiating_author --> <!-- start_revert_reason --> Reason for reverting: flutter#166998 (comment) <!-- end_revert_reason --> <!-- start_original_pr_author --> Original PR Author: gmackall <!-- end_original_pr_author --> <!-- start_reviewers --> Reviewed By: {stuartmorgan-g} <!-- end_reviewers --> <!-- start_revert_body --> This change reverts the following previous change: Fixes a regression from flutter#166727, see https://discord.com/channels/608014603317936148/846507907876257822/1360306682999210204 Adds a dependency on `shared_preferences_android` to the smoke tests we have that run across the range of AGP/Gradle versions we support. Chosen randomly, just to recreate the error. Hopefully this doesn't push the test target into timeout range, it was already a kind of long running one. The IDE suggestion here was misleading, as this value switched from nullable to non nullable in AGP 8.1/8.2. Unfortunately the IDE makes these suggestions based on one AGP version, specified in the project level `build.gradle.kts`. I checked all other files with our minimum supported AGP version, and this was the only error. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <[email protected]>
1 parent a4b5a50 commit 28cc211

2 files changed

Lines changed: 3 additions & 23 deletions

File tree

dev/devicelab/lib/framework/dependency_smoke_test_task_definition.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,6 @@ Future<TaskResult> buildFlutterApkWithSpecifiedDependencyVersions({
144144
.replaceFirst(kgpReplacementString, versions.kotlinVersion);
145145
await gradleSettingsFile.writeAsString(settingsContent, flush: true);
146146

147-
section('Add a dependency on a plugin');
148-
await flutter(
149-
'pub',
150-
options: <String>['add', 'shared_preferences_android:2.4.9'], // Chosen randomly.
151-
workingDirectory: appPath,
152-
);
153-
154147
// Ensure that gradle files exists from templates.
155148
section(
156149
"Ensure 'flutter build apk' succeeds with Gradle ${versions.gradleVersion}, AGP ${versions.agpVersion}, and Kotlin ${versions.kotlinVersion}",

packages/flutter_tools/gradle/src/main/kotlin/FlutterPluginUtils.kt

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -517,16 +517,8 @@ object FlutterPluginUtils {
517517
getCompileSdkFromProject(project).toIntOrNull() ?: Int.MAX_VALUE
518518

519519
var maxPluginCompileSdkVersion = projectCompileSdkVersion
520-
// TODO(gmackall): This should be updated to reflect newer templates.
521-
// The default for AGP 4.1.0 used in old templates.
522-
val ndkVersionIfUnspecified = "21.1.6352462"
523-
524-
// TODO(gmackall): We can remove this elvis when our minimum AGP is >= 8.2.
525-
// This value (ndkVersion) is nullable on AGP versions below that.
526-
// See https://developer.android.com/reference/tools/gradle-api/8.1/com/android/build/api/dsl/CommonExtension#ndkVersion().
527-
@Suppress("USELESS_ELVIS")
528-
val projectNdkVersion: String =
529-
getAndroidExtension(project).ndkVersion // ?: ndkVersionIfUnspecified
520+
val projectNdkVersion =
521+
getAndroidExtension(project).ndkVersion
530522
var maxPluginNdkVersion = projectNdkVersion
531523
var numProcessedPlugins = pluginList.size
532524
val pluginsWithHigherSdkVersion = mutableListOf<PluginVersionPair>()
@@ -551,13 +543,8 @@ object FlutterPluginUtils {
551543
)
552544
)
553545
}
554-
555-
// TODO(gmackall): We can remove this elvis when our minimum AGP is >= 8.2.
556-
// This value (ndkVersion) is nullable on AGP versions below that.
557-
// See https://developer.android.com/reference/tools/gradle-api/8.1/com/android/build/api/dsl/CommonExtension#ndkVersion().
558-
@Suppress("USELESS_ELVIS")
559546
val pluginNdkVersion: String =
560-
getAndroidExtension(pluginProject).ndkVersion // ?: ndkVersionIfUnspecified
547+
getAndroidExtension(pluginProject).ndkVersion
561548
maxPluginNdkVersion =
562549
VersionUtils.mostRecentSemanticVersion(
563550
pluginNdkVersion,

0 commit comments

Comments
 (0)