diff --git a/pkgs/jni/android/build.gradle b/pkgs/jni/android/build.gradle index 5f698aadb..1805d4076 100644 --- a/pkgs/jni/android/build.gradle +++ b/pkgs/jni/android/build.gradle @@ -45,9 +45,9 @@ android { } } - // Bumping the plugin compileSdkVersion requires all clients of this plugin + // Bumping the plugin compileSdk requires all clients of this plugin // to bump the version in their app. - compileSdkVersion 31 + compileSdk 35 // Bumping the plugin ndkVersion requires all clients of this plugin to bump // the version in their app and to download a newer version of the NDK. diff --git a/pkgs/jni/example/android/app/build.gradle b/pkgs/jni/example/android/app/build.gradle index f70d15e16..b25355d11 100644 --- a/pkgs/jni/example/android/app/build.gradle +++ b/pkgs/jni/example/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "com.github.dart_lang.jni_example" - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/pkgs/jnigen/android_test_runner/android/app/build.gradle b/pkgs/jnigen/android_test_runner/android/app/build.gradle index 8347eb202..30f210fea 100644 --- a/pkgs/jnigen/android_test_runner/android/app/build.gradle +++ b/pkgs/jnigen/android_test_runner/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "com.github.dart_lang.jnigen.android_integration_test" - compileSdkVersion 35 + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/pkgs/jnigen/example/in_app_java/android/app/build.gradle b/pkgs/jnigen/example/in_app_java/android/app/build.gradle index 6604b6537..d50aacaa3 100644 --- a/pkgs/jnigen/example/in_app_java/android/app/build.gradle +++ b/pkgs/jnigen/example/in_app_java/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "com.example.in_app_java" - compileSdkVersion 35 + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/pkgs/jnigen/example/kotlin_plugin/android/build.gradle b/pkgs/jnigen/example/kotlin_plugin/android/build.gradle index 1599386e5..6e59b37e4 100644 --- a/pkgs/jnigen/example/kotlin_plugin/android/build.gradle +++ b/pkgs/jnigen/example/kotlin_plugin/android/build.gradle @@ -16,13 +16,8 @@ apply plugin: 'kotlin-android' android { namespace 'com.example.kotlin_plugin' - // Bumping the plugin compileSdkVersion requires all clients of this plugin - // to bump the version in their app. - compileSdkVersion 31 - - // Bumping the plugin ndkVersion requires all clients of this plugin to bump - // the version in their app and to download a newer version of the NDK. - ndkVersion "21.1.6352462" + compileSdk flutter.compileSdkVersion + ndkVersion flutter.ndkVersion sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/pkgs/jnigen/example/kotlin_plugin/example/android/app/build.gradle b/pkgs/jnigen/example/kotlin_plugin/example/android/app/build.gradle index 703cd6f81..a1efed0a1 100644 --- a/pkgs/jnigen/example/kotlin_plugin/example/android/app/build.gradle +++ b/pkgs/jnigen/example/kotlin_plugin/example/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "com.example.kotlin_plugin.example" - compileSdkVersion 35 + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/pkgs/jnigen/example/notification_plugin/android/build.gradle b/pkgs/jnigen/example/notification_plugin/android/build.gradle index 56f9f28d2..1e69ec45d 100644 --- a/pkgs/jnigen/example/notification_plugin/android/build.gradle +++ b/pkgs/jnigen/example/notification_plugin/android/build.gradle @@ -15,13 +15,8 @@ apply plugin: 'com.android.library' android { namespace 'com.example.notification_plugin' - // Bumping the plugin compileSdkVersion requires all clients of this plugin - // to bump the version in their app. - compileSdkVersion 31 - - // Bumping the plugin ndkVersion requires all clients of this plugin to bump - // the version in their app and to download a newer version of the NDK. - ndkVersion "21.1.6352462" + compileSdk flutter.compileSdkVersion + ndkVersion flutter.ndkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_11 diff --git a/pkgs/jnigen/example/notification_plugin/example/android/app/build.gradle b/pkgs/jnigen/example/notification_plugin/example/android/app/build.gradle index 6387abf15..247834ec0 100644 --- a/pkgs/jnigen/example/notification_plugin/example/android/app/build.gradle +++ b/pkgs/jnigen/example/notification_plugin/example/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "com.example.notification_plugin_example" - compileSdkVersion 35 + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/pkgs/jnigen/example/pdfbox_plugin/android/build.gradle b/pkgs/jnigen/example/pdfbox_plugin/android/build.gradle index 73234528c..54db51279 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/android/build.gradle +++ b/pkgs/jnigen/example/pdfbox_plugin/android/build.gradle @@ -15,13 +15,8 @@ apply plugin: 'com.android.library' android { namespace 'com.example.pdfbox_plugin' - // Bumping the plugin compileSdkVersion requires all clients of this plugin - // to bump the version in their app. - compileSdkVersion 31 - - // Bumping the plugin ndkVersion requires all clients of this plugin to bump - // the version in their app and to download a newer version of the NDK. - ndkVersion "21.1.6352462" + compileSdk flutter.compileSdkVersion + ndkVersion flutter.ndkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_11 diff --git a/pkgs/jnigen/example/pdfbox_plugin/example/android/app/build.gradle b/pkgs/jnigen/example/pdfbox_plugin/example/android/app/build.gradle index 6563fa317..d1291b92c 100644 --- a/pkgs/jnigen/example/pdfbox_plugin/example/android/app/build.gradle +++ b/pkgs/jnigen/example/pdfbox_plugin/example/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "com.example.pdfbox_plugin_example" - compileSdkVersion 35 + compileSdk flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart index da971a75d..f591563ed 100644 --- a/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart +++ b/pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart @@ -27,9 +27,6 @@ void main() { Architecture.riscv64: 'elf64-littleriscv', }; - /// From https://docs.flutter.dev/reference/supported-platforms. - const flutterAndroidNdkVersionLowestBestEffort = 19; - /// From https://docs.flutter.dev/reference/supported-platforms. const flutterAndroidNdkVersionLowestSupported = 21; @@ -42,7 +39,6 @@ void main() { for (final linkMode in [DynamicLoadingBundled(), StaticLinking()]) { for (final target in targets) { for (final apiLevel in [ - flutterAndroidNdkVersionLowestBestEffort, flutterAndroidNdkVersionLowestSupported, flutterAndroidNdkVersionHighestSupported, ]) {