Skip to content

Commit 12e3590

Browse files
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>
1 parent 232265c commit 12e3590

File tree

9 files changed

+15
-10
lines changed

9 files changed

+15
-10
lines changed

.changes/update-android-sdk.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'tauri-cli': 'patch:changes'
3+
---
4+
5+
Update compileSdk, targetSdk in android template to 36

crates/tauri-cli/templates/mobile/android/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ val tauriProperties = Properties().apply {
1616
}
1717

1818
android {
19-
compileSdk = 34
19+
compileSdk = 36
2020
namespace = "{{app.identifier}}"
2121
defaultConfig {
2222
manifestPlaceholders["usesCleartextTraffic"] = "false"
2323
applicationId = "{{app.identifier}}"
2424
minSdk = {{android.min-sdk-version}}
25-
targetSdk = 34
25+
targetSdk = 36
2626
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
2727
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
2828
}

crates/tauri-cli/templates/mobile/android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath("com.android.tools.build:gradle:8.5.1")
7+
classpath("com.android.tools.build:gradle:8.11.0")
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
99
{{~#each android-project-dependencies}}
1010
classpath("{{this}}"){{/each}}

crates/tauri-cli/templates/mobile/android/buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ repositories {
1818

1919
dependencies {
2020
compileOnly(gradleApi())
21-
implementation("com.android.tools.build:gradle:8.5.1")
21+
implementation("com.android.tools.build:gradle:8.11.0")
2222
}
2323

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue May 10 19:22:52 CST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

crates/tauri-cli/templates/plugin/android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace = "{{android_package_id}}"
8-
compileSdk = 34
8+
compileSdk = 36
99

1010
defaultConfig {
1111
minSdk = 21

crates/tauri/mobile/android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace = "app.tauri"
8-
compileSdk = 34
8+
compileSdk = 36
99

1010
defaultConfig {
1111
minSdk = 21

examples/api/src-tauri/tauri-plugin-sample/android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace = "com.plugin.sample"
8-
compileSdk = 34
8+
compileSdk = 36
99

1010
defaultConfig {
1111
minSdk = 21

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"format:check": "prettier --check .",
1616
"eslint:check": "pnpm run -r eslint:check",
1717
"ts:check": "pnpm run -r ts:check",
18-
"build": "pnpm run -r build",
19-
"build:debug": "pnpm run -r build:debug",
18+
"build": "pnpm run -F !api build && pnpm run -F api build",
19+
"build:debug": "pnpm run -F !api build:debug && pnpm run -F api build:debug",
2020
"build:api": "pnpm run --filter \"@tauri-apps/api\" build",
2121
"build:api:debug": "pnpm run --filter \"@tauri-apps/api\" build:debug",
2222
"build:cli": "pnpm run --filter \"@tauri-apps/cli\" build",

0 commit comments

Comments
 (0)