From 12e3590613c7b4370aeddc16db7e29335e3a7684 Mon Sep 17 00:00:00 2001 From: Jeong Min Oh Date: Tue, 8 Jul 2025 18:00:26 +0900 Subject: [PATCH] Fix(package.json) build script, Fix(android) build template (#13759) * Update compileSdk targetSdk, Fix build cmd * Add changelog * Update AGP version * Update package.json * Update AGP * Update SDK * Update * Update .changes/update-android-sdk.md Co-authored-by: Tony <68118705+Legend-Master@users.noreply.github.com> * Use changes tag in change file --------- Co-authored-by: Tony <68118705+Legend-Master@users.noreply.github.com> --- .changes/update-android-sdk.md | 5 +++++ .../tauri-cli/templates/mobile/android/app/build.gradle.kts | 4 ++-- crates/tauri-cli/templates/mobile/android/build.gradle.kts | 2 +- .../templates/mobile/android/buildSrc/build.gradle.kts | 2 +- .../mobile/android/gradle/wrapper/gradle-wrapper.properties | 2 +- crates/tauri-cli/templates/plugin/android/build.gradle.kts | 2 +- crates/tauri/mobile/android/build.gradle.kts | 2 +- .../src-tauri/tauri-plugin-sample/android/build.gradle.kts | 2 +- package.json | 4 ++-- 9 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .changes/update-android-sdk.md diff --git a/.changes/update-android-sdk.md b/.changes/update-android-sdk.md new file mode 100644 index 000000000..87dc12860 --- /dev/null +++ b/.changes/update-android-sdk.md @@ -0,0 +1,5 @@ +--- +'tauri-cli': 'patch:changes' +--- + +Update compileSdk, targetSdk in android template to 36 diff --git a/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts b/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts index 6f408f536..abb8efdb7 100644 --- a/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts +++ b/crates/tauri-cli/templates/mobile/android/app/build.gradle.kts @@ -16,13 +16,13 @@ val tauriProperties = Properties().apply { } android { - compileSdk = 34 + compileSdk = 36 namespace = "{{app.identifier}}" defaultConfig { manifestPlaceholders["usesCleartextTraffic"] = "false" applicationId = "{{app.identifier}}" minSdk = {{android.min-sdk-version}} - targetSdk = 34 + targetSdk = 36 versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0") } diff --git a/crates/tauri-cli/templates/mobile/android/build.gradle.kts b/crates/tauri-cli/templates/mobile/android/build.gradle.kts index 0bf63ab7d..9246cef49 100644 --- a/crates/tauri-cli/templates/mobile/android/build.gradle.kts +++ b/crates/tauri-cli/templates/mobile/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") {{~#each android-project-dependencies}} classpath("{{this}}"){{/each}} diff --git a/crates/tauri-cli/templates/mobile/android/buildSrc/build.gradle.kts b/crates/tauri-cli/templates/mobile/android/buildSrc/build.gradle.kts index 39e90b054..5c55bba71 100644 --- a/crates/tauri-cli/templates/mobile/android/buildSrc/build.gradle.kts +++ b/crates/tauri-cli/templates/mobile/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/crates/tauri-cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties b/crates/tauri-cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties index 0df10d556..c5f9a53c2 100644 --- a/crates/tauri-cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/crates/tauri-cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 10 19:22:52 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/crates/tauri-cli/templates/plugin/android/build.gradle.kts b/crates/tauri-cli/templates/plugin/android/build.gradle.kts index 77fc80d08..f788a85fb 100644 --- a/crates/tauri-cli/templates/plugin/android/build.gradle.kts +++ b/crates/tauri-cli/templates/plugin/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "{{android_package_id}}" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 21 diff --git a/crates/tauri/mobile/android/build.gradle.kts b/crates/tauri/mobile/android/build.gradle.kts index 7b1e79123..f997910c9 100644 --- a/crates/tauri/mobile/android/build.gradle.kts +++ b/crates/tauri/mobile/android/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "app.tauri" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 21 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 e61b6d737..94f504ede 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,7 +5,7 @@ plugins { android { namespace = "com.plugin.sample" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 21 diff --git a/package.json b/package.json index 474f8f2f0..1f6f36d35 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "format:check": "prettier --check .", "eslint:check": "pnpm run -r eslint:check", "ts:check": "pnpm run -r ts:check", - "build": "pnpm run -r build", - "build:debug": "pnpm run -r build:debug", + "build": "pnpm run -F !api build && pnpm run -F api build", + "build:debug": "pnpm run -F !api build:debug && pnpm run -F api build:debug", "build:api": "pnpm run --filter \"@tauri-apps/api\" build", "build:api:debug": "pnpm run --filter \"@tauri-apps/api\" build:debug", "build:cli": "pnpm run --filter \"@tauri-apps/cli\" build",