diff --git a/.changes/compilesdk35.md b/.changes/compilesdk35.md new file mode 100644 index 0000000000..7596d4764e --- /dev/null +++ b/.changes/compilesdk35.md @@ -0,0 +1,28 @@ +--- +barcode-scanner: patch +barcode-scanner-js: patch +biometric: patch +biometric-js: patch +clipboard-manager: patch +clipboard-manager-js: patch +deep-link: patch +deep-link-js: patch +dialog: patch +dialog-js: patch +fs: patch +fs-js: patch +geolocation: patch +geolocation-js: patch +haptics: patch +haptics-js: patch +nfc: patch +nfc-js: patch +notification: patch +notification-js: patch +opener: patch +opener-js: patch +shell: patch +shell-js: patch +--- + +On Android, updated compileSdk to 36. diff --git a/examples/api/src-tauri/gen/android/app/build.gradle.kts b/examples/api/src-tauri/gen/android/app/build.gradle.kts index f7047ca0ad..029d0f4927 100644 --- a/examples/api/src-tauri/gen/android/app/build.gradle.kts +++ b/examples/api/src-tauri/gen/android/app/build.gradle.kts @@ -14,13 +14,13 @@ val tauriProperties = Properties().apply { } android { - compileSdk = 34 + compileSdk = 36 namespace = "com.tauri.api" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" applicationId = "com.tauri.api" minSdk = 24 - targetSdk = 34 + targetSdk = 36 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0") } diff --git a/examples/api/src-tauri/gen/android/build.gradle.kts b/examples/api/src-tauri/gen/android/build.gradle.kts index c5ef452a67..607240bc8f 100644 --- a/examples/api/src-tauri/gen/android/build.gradle.kts +++ b/examples/api/src-tauri/gen/android/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.5.1") + classpath("com.android.tools.build:gradle:8.11.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25") } } diff --git a/examples/api/src-tauri/gen/android/buildSrc/build.gradle.kts b/examples/api/src-tauri/gen/android/buildSrc/build.gradle.kts index 39e90b0543..5c55bba71c 100644 --- a/examples/api/src-tauri/gen/android/buildSrc/build.gradle.kts +++ b/examples/api/src-tauri/gen/android/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ repositories { dependencies { compileOnly(gradleApi()) - implementation("com.android.tools.build:gradle:8.5.1") + implementation("com.android.tools.build:gradle:8.11.0") } diff --git a/plugins/barcode-scanner/android/build.gradle.kts b/plugins/barcode-scanner/android/build.gradle.kts index f3ecd6c71b..8b9e651c8e 100644 --- a/plugins/barcode-scanner/android/build.gradle.kts +++ b/plugins/barcode-scanner/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.barcodescanner" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/biometric/android/build.gradle.kts b/plugins/biometric/android/build.gradle.kts index d8833662cd..7f78b4a944 100644 --- a/plugins/biometric/android/build.gradle.kts +++ b/plugins/biometric/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.biometric" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/clipboard-manager/android/build.gradle.kts b/plugins/clipboard-manager/android/build.gradle.kts index b12a74820c..cb47a9d381 100644 --- a/plugins/clipboard-manager/android/build.gradle.kts +++ b/plugins/clipboard-manager/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.clipboard" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/deep-link/android/build.gradle.kts b/plugins/deep-link/android/build.gradle.kts index 671ee8b7f1..11021bfd63 100644 --- a/plugins/deep-link/android/build.gradle.kts +++ b/plugins/deep-link/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.deep_link" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/dialog/android/build.gradle.kts b/plugins/dialog/android/build.gradle.kts index e824cff9de..248ebf68fe 100644 --- a/plugins/dialog/android/build.gradle.kts +++ b/plugins/dialog/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.dialog" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/fs/android/build.gradle.kts b/plugins/fs/android/build.gradle.kts index 575040aaaf..374ac0f64c 100644 --- a/plugins/fs/android/build.gradle.kts +++ b/plugins/fs/android/build.gradle.kts @@ -5,11 +5,10 @@ plugins { android { namespace = "com.plugin.fs" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 21 - targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/geolocation/android/build.gradle.kts b/plugins/geolocation/android/build.gradle.kts index 18fba0f3a3..5bc7b3824f 100644 --- a/plugins/geolocation/android/build.gradle.kts +++ b/plugins/geolocation/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.geolocation" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/haptics/android/build.gradle.kts b/plugins/haptics/android/build.gradle.kts index 7de1d3726b..88c2f82b92 100644 --- a/plugins/haptics/android/build.gradle.kts +++ b/plugins/haptics/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.haptics" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/nfc/android/build.gradle.kts b/plugins/nfc/android/build.gradle.kts index 595f91736c..f5a5c2cac6 100644 --- a/plugins/nfc/android/build.gradle.kts +++ b/plugins/nfc/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.nfc" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/notification/android/build.gradle.kts b/plugins/notification/android/build.gradle.kts index 0ac990e413..31b654e34f 100644 --- a/plugins/notification/android/build.gradle.kts +++ b/plugins/notification/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.notification" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/opener/android/build.gradle.kts b/plugins/opener/android/build.gradle.kts index 49ddbe2271..b6ea1bef24 100644 --- a/plugins/opener/android/build.gradle.kts +++ b/plugins/opener/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.opener" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/plugins/shell/android/build.gradle.kts b/plugins/shell/android/build.gradle.kts index 88082c65ee..b8c6a2c9c7 100644 --- a/plugins/shell/android/build.gradle.kts +++ b/plugins/shell/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "app.tauri.shell" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/shared/template/android/build.gradle.kts b/shared/template/android/build.gradle.kts index 1d0e9d8e85..dfa24588fd 100644 --- a/shared/template/android/build.gradle.kts +++ b/shared/template/android/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "{{android_package_id}}" - compileSdk = 34 + compileSdk = 36 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro")