From 4942910db0c35c1eec5f48fdbde1c3b5b7409d9c Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 24 May 2024 11:03:00 -0300 Subject: [PATCH 1/2] chore(cli): update Android target SDK to 34 --- .changes/update-target-sdk.md | 7 +++++++ core/tauri/mobile/android/build.gradle.kts | 4 ++-- examples/api/src-tauri/Cargo.lock | 11 ----------- .../tauri-plugin-sample/android/build.gradle.kts | 4 ++-- .../cli/templates/mobile/android/app/build.gradle.kts | 4 ++-- tooling/cli/templates/plugin/android/build.gradle.kts | 4 ++-- 6 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 .changes/update-target-sdk.md diff --git a/.changes/update-target-sdk.md b/.changes/update-target-sdk.md new file mode 100644 index 000000000000..226e9f131554 --- /dev/null +++ b/.changes/update-target-sdk.md @@ -0,0 +1,7 @@ +--- +"tauri-cli": patch:changes +"@tauri-apps/cli": patch:changes +"tauri:" patch:changes +--- + +Updated Android target SDK to 34. diff --git a/core/tauri/mobile/android/build.gradle.kts b/core/tauri/mobile/android/build.gradle.kts index 36cc3f1a0bee..533c5fd0c05f 100644 --- a/core/tauri/mobile/android/build.gradle.kts +++ b/core/tauri/mobile/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { android { namespace = "app.tauri" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("proguard-rules.pro") diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock index 2e1783c46950..f108de159628 100644 --- a/examples/api/src-tauri/Cargo.lock +++ b/examples/api/src-tauri/Cargo.lock @@ -107,7 +107,6 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-sample", - "tauri-plugin-xcode", "tiny_http", ] @@ -3140,16 +3139,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "tauri-plugin-xcode" -version = "0.0.0" -dependencies = [ - "serde", - "tauri", - "tauri-plugin", - "thiserror", -] - [[package]] name = "tauri-runtime" version = "2.0.0-beta.17" diff --git a/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts b/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts index 05d495993eea..8b1ce2f3d898 100644 --- a/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts +++ b/examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { android { namespace = "com.plugin.sample" - compileSdk = 32 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") diff --git a/tooling/cli/templates/mobile/android/app/build.gradle.kts b/tooling/cli/templates/mobile/android/app/build.gradle.kts index 3217765fdbd5..ed6331d03f75 100644 --- a/tooling/cli/templates/mobile/android/app/build.gradle.kts +++ b/tooling/cli/templates/mobile/android/app/build.gradle.kts @@ -16,13 +16,13 @@ val tauriProperties = Properties().apply { } android { - compileSdk = 33 + compileSdk = 34 namespace = "{{reverse-domain app.identifier}}" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" applicationId = "{{reverse-domain app.identifier}}" minSdk = {{android.min-sdk-version}} - targetSdk = 33 + targetSdk = 34 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0") } diff --git a/tooling/cli/templates/plugin/android/build.gradle.kts b/tooling/cli/templates/plugin/android/build.gradle.kts index 2a891a631652..a1876c1e5a7e 100644 --- a/tooling/cli/templates/plugin/android/build.gradle.kts +++ b/tooling/cli/templates/plugin/android/build.gradle.kts @@ -5,11 +5,11 @@ plugins { android { namespace = "{{android_package_id}}" - compileSdk = 32 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") From 469d5f007a69564d683e9fc948b15ab2a87c0c1e Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 24 May 2024 11:12:09 -0300 Subject: [PATCH 2/2] fix change file --- .changes/update-target-sdk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changes/update-target-sdk.md b/.changes/update-target-sdk.md index 226e9f131554..fa052fdebe3d 100644 --- a/.changes/update-target-sdk.md +++ b/.changes/update-target-sdk.md @@ -1,7 +1,7 @@ --- "tauri-cli": patch:changes "@tauri-apps/cli": patch:changes -"tauri:" patch:changes +"tauri": patch:changes --- Updated Android target SDK to 34.