From 9d287b8928a550d7f4631e7e1fe065f59f0150b3 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Mon, 20 Oct 2025 15:04:20 +0200 Subject: [PATCH 1/3] compileSdk 35 --- .changes/compilesdk35.md | 28 +++++++++++++++++++ .../gen/android/app/build.gradle.kts | 4 +-- .../src-tauri/gen/android/build.gradle.kts | 2 +- .../gen/android/buildSrc/build.gradle.kts | 2 +- .../barcode-scanner/android/build.gradle.kts | 4 +-- plugins/biometric/android/build.gradle.kts | 4 +-- .../android/build.gradle.kts | 4 +-- plugins/deep-link/android/build.gradle.kts | 4 +-- plugins/dialog/android/build.gradle.kts | 4 +-- plugins/fs/android/build.gradle.kts | 3 +- plugins/geolocation/android/build.gradle.kts | 4 +-- plugins/haptics/android/build.gradle.kts | 4 +-- plugins/nfc/android/build.gradle.kts | 4 +-- plugins/notification/android/build.gradle.kts | 4 +-- plugins/opener/android/build.gradle.kts | 4 +-- plugins/shell/android/build.gradle.kts | 4 +-- shared/template/android/build.gradle.kts | 4 +-- 17 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 .changes/compilesdk35.md diff --git a/.changes/compilesdk35.md b/.changes/compilesdk35.md new file mode 100644 index 0000000000..81b3fe1fc5 --- /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 35. 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..da757a58ed 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 = 35 namespace = "com.tauri.api" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" applicationId = "com.tauri.api" minSdk = 24 - targetSdk = 34 + targetSdk = 35 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..bf43548691 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.6.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..6ee8469474 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.6.0") } diff --git a/plugins/barcode-scanner/android/build.gradle.kts b/plugins/barcode-scanner/android/build.gradle.kts index f3ecd6c71b..ec39f829fb 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 = 35 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..ffc79a12dc 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 = 35 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..987141e0e1 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 = 35 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..eacab385f2 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 = 35 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..9440441deb 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 = 35 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..d7dc3638bd 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 = 35 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..907e125bdb 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 = 35 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..0aa0987cce 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 = 35 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..6270cfe8fa 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 = 35 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..c3415655ee 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 = 35 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..37f7293864 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 = 35 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..887ea08937 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 = 35 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..6675a68255 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 = 35 defaultConfig { - minSdk = 24 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") From 1da7079d7c1047d5164f04b07cb7ba3b97921fb2 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Mon, 20 Oct 2025 15:10:46 +0200 Subject: [PATCH 2/3] update gradle plugin --- examples/api/src-tauri/gen/android/build.gradle.kts | 2 +- examples/api/src-tauri/gen/android/buildSrc/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/api/src-tauri/gen/android/build.gradle.kts b/examples/api/src-tauri/gen/android/build.gradle.kts index bf43548691..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.6.0") + 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 6ee8469474..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.6.0") + implementation("com.android.tools.build:gradle:8.11.0") } From 18e52e6d808319d78daa789554bbf1020f1bbca2 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Mon, 20 Oct 2025 15:14:15 +0200 Subject: [PATCH 3/3] 36 --- .changes/compilesdk35.md | 2 +- examples/api/src-tauri/gen/android/app/build.gradle.kts | 4 ++-- plugins/barcode-scanner/android/build.gradle.kts | 2 +- plugins/biometric/android/build.gradle.kts | 2 +- plugins/clipboard-manager/android/build.gradle.kts | 2 +- plugins/deep-link/android/build.gradle.kts | 2 +- plugins/dialog/android/build.gradle.kts | 2 +- plugins/fs/android/build.gradle.kts | 2 +- plugins/geolocation/android/build.gradle.kts | 2 +- plugins/haptics/android/build.gradle.kts | 2 +- plugins/nfc/android/build.gradle.kts | 2 +- plugins/notification/android/build.gradle.kts | 2 +- plugins/opener/android/build.gradle.kts | 2 +- plugins/shell/android/build.gradle.kts | 2 +- shared/template/android/build.gradle.kts | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.changes/compilesdk35.md b/.changes/compilesdk35.md index 81b3fe1fc5..7596d4764e 100644 --- a/.changes/compilesdk35.md +++ b/.changes/compilesdk35.md @@ -25,4 +25,4 @@ shell: patch shell-js: patch --- -On Android, updated compileSdk to 35. +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 da757a58ed..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 = 35 + compileSdk = 36 namespace = "com.tauri.api" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" applicationId = "com.tauri.api" minSdk = 24 - targetSdk = 35 + targetSdk = 36 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0") } diff --git a/plugins/barcode-scanner/android/build.gradle.kts b/plugins/barcode-scanner/android/build.gradle.kts index ec39f829fb..8b9e651c8e 100644 --- a/plugins/barcode-scanner/android/build.gradle.kts +++ b/plugins/barcode-scanner/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.barcodescanner" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/biometric/android/build.gradle.kts b/plugins/biometric/android/build.gradle.kts index ffc79a12dc..7f78b4a944 100644 --- a/plugins/biometric/android/build.gradle.kts +++ b/plugins/biometric/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.biometric" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/clipboard-manager/android/build.gradle.kts b/plugins/clipboard-manager/android/build.gradle.kts index 987141e0e1..cb47a9d381 100644 --- a/plugins/clipboard-manager/android/build.gradle.kts +++ b/plugins/clipboard-manager/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.clipboard" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/deep-link/android/build.gradle.kts b/plugins/deep-link/android/build.gradle.kts index eacab385f2..11021bfd63 100644 --- a/plugins/deep-link/android/build.gradle.kts +++ b/plugins/deep-link/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.deep_link" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/dialog/android/build.gradle.kts b/plugins/dialog/android/build.gradle.kts index 9440441deb..248ebf68fe 100644 --- a/plugins/dialog/android/build.gradle.kts +++ b/plugins/dialog/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.dialog" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/fs/android/build.gradle.kts b/plugins/fs/android/build.gradle.kts index d7dc3638bd..374ac0f64c 100644 --- a/plugins/fs/android/build.gradle.kts +++ b/plugins/fs/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "com.plugin.fs" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 21 diff --git a/plugins/geolocation/android/build.gradle.kts b/plugins/geolocation/android/build.gradle.kts index 907e125bdb..5bc7b3824f 100644 --- a/plugins/geolocation/android/build.gradle.kts +++ b/plugins/geolocation/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.geolocation" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/haptics/android/build.gradle.kts b/plugins/haptics/android/build.gradle.kts index 0aa0987cce..88c2f82b92 100644 --- a/plugins/haptics/android/build.gradle.kts +++ b/plugins/haptics/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.haptics" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/nfc/android/build.gradle.kts b/plugins/nfc/android/build.gradle.kts index 6270cfe8fa..f5a5c2cac6 100644 --- a/plugins/nfc/android/build.gradle.kts +++ b/plugins/nfc/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.nfc" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/notification/android/build.gradle.kts b/plugins/notification/android/build.gradle.kts index c3415655ee..31b654e34f 100644 --- a/plugins/notification/android/build.gradle.kts +++ b/plugins/notification/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.notification" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/opener/android/build.gradle.kts b/plugins/opener/android/build.gradle.kts index 37f7293864..b6ea1bef24 100644 --- a/plugins/opener/android/build.gradle.kts +++ b/plugins/opener/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.opener" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/plugins/shell/android/build.gradle.kts b/plugins/shell/android/build.gradle.kts index 887ea08937..b8c6a2c9c7 100644 --- a/plugins/shell/android/build.gradle.kts +++ b/plugins/shell/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri.shell" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24 diff --git a/shared/template/android/build.gradle.kts b/shared/template/android/build.gradle.kts index 6675a68255..dfa24588fd 100644 --- a/shared/template/android/build.gradle.kts +++ b/shared/template/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "{{android_package_id}}" - compileSdk = 35 + compileSdk = 36 defaultConfig { minSdk = 24