Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[jni] chore: bump compileSdk #2167

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[jni] chore: bump compileSdk #2167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e26fe8
bump compileSdk to 35
lsaudon Apr 3, 2025
0feddcf
chore: best effort is dropped
lsaudon Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/jni/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/jni/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/jnigen/android_test_runner/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/jnigen/example/in_app_java/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (flutterVersionName == null) {
android {
namespace "com.example.in_app_java"

compileSdkVersion 35
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
9 changes: 2 additions & 7 deletions pkgs/jnigen/example/kotlin_plugin/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion pkgs/jnigen/example/kotlin_plugin/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (flutterVersionName == null) {
android {
namespace "com.example.kotlin_plugin.example"

compileSdkVersion 35
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
9 changes: 2 additions & 7 deletions pkgs/jnigen/example/notification_plugin/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/jnigen/example/notification_plugin/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (flutterVersionName == null) {
android {
namespace "com.example.notification_plugin_example"

compileSdkVersion 35
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
9 changes: 2 additions & 7 deletions pkgs/jnigen/example/pdfbox_plugin/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/jnigen/example/pdfbox_plugin/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (flutterVersionName == null) {
android {
namespace "com.example.pdfbox_plugin_example"

compileSdkVersion 35
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
Expand Down
4 changes: 0 additions & 4 deletions pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -42,7 +39,6 @@ void main() {
for (final linkMode in [DynamicLoadingBundled(), StaticLinking()]) {
for (final target in targets) {
for (final apiLevel in [
flutterAndroidNdkVersionLowestBestEffort,
flutterAndroidNdkVersionLowestSupported,
flutterAndroidNdkVersionHighestSupported,
]) {
Expand Down
Loading