Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .changes/compilesdk35.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions examples/api/src-tauri/gen/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion examples/api/src-tauri/gen/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

4 changes: 2 additions & 2 deletions plugins/barcode-scanner/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/biometric/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/clipboard-manager/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/deep-link/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/dialog/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions plugins/fs/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/geolocation/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/haptics/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/nfc/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/notification/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/opener/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/shell/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions shared/template/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down