Skip to content

Commit acd383a

Browse files
committed
fix(android): adjust for Kotlin and project warnings
1 parent f1a60fc commit acd383a

File tree

25 files changed

+238
-172
lines changed

25 files changed

+238
-172
lines changed

.changes/fix-android-warnings.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"barcode-scanner": patch
3+
"biometric": patch
4+
"clipboard-manager": patch
5+
"nfc": patch
6+
"notification": patch
7+
"shell": patch
8+
---
9+
10+
Fixes Android warnings.

examples/api/src-tauri/gen/android/.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

examples/api/src-tauri/gen/android/.idea/gradle.xml

Lines changed: 15 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/api/src-tauri/gen/android/.idea/jarRepositories.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

examples/api/src-tauri/gen/android/.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/api/src-tauri/gen/android/app/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
/src/main/jniLibs/**/*.so
33
/src/main/assets/tauri.conf.json
44
/tauri.build.gradle.kts
5-
/proguard-tauri.pro
5+
/proguard-tauri.pro
6+
/tauri.properties

examples/api/src-tauri/gen/android/app/build.gradle.kts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1+
import java.util.Properties
2+
13
plugins {
24
id("com.android.application")
35
id("org.jetbrains.kotlin.android")
46
id("rust")
57
}
68

9+
val tauriProperties = Properties().apply {
10+
val propFile = file("tauri.properties")
11+
if (propFile.exists()) {
12+
propFile.inputStream().use { load(it) }
13+
}
14+
}
15+
716
android {
817
compileSdk = 34
918
namespace = "com.tauri.api"
@@ -12,8 +21,8 @@ android {
1221
applicationId = "com.tauri.api"
1322
minSdk = 24
1423
targetSdk = 34
15-
versionCode = 1
16-
versionName = "1.0"
24+
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
25+
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
1726
}
1827
buildTypes {
1928
getByName("debug") {
@@ -54,4 +63,4 @@ dependencies {
5463
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
5564
}
5665

57-
apply(from = "tauri.build.gradle.kts")
66+
apply(from = "tauri.build.gradle.kts")

examples/api/src-tauri/gen/android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33
<uses-permission android:name="android.permission.INTERNET" />
4-
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
54
<application
65
android:icon="@mipmap/ic_launcher"
76
android:label="@string/app_name"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package com.tauri.api
22

3-
class MainActivity : TauriActivity()
3+
class MainActivity : TauriActivity()

examples/api/src-tauri/gen/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.0.0")
7+
classpath("com.android.tools.build:gradle:8.3.2")
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
99
}
1010
}

0 commit comments

Comments
 (0)