diff options
| -rw-r--r-- | androidApp/build.gradle.kts | 5 | ||||
| -rw-r--r-- | androidApp/src/google/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | androidApp/src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | build.gradle.kts | 8 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | shared/build.gradle.kts | 1 | ||||
| -rw-r--r-- | shared/src/androidMain/AndroidManifest.xml | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index f087e25..6760c56 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -6,11 +6,11 @@ plugins { } android { - compileSdk = 31 + compileSdk = 34 defaultConfig { applicationId = "mx.trackermap.TrackerMap" minSdk = 21 - targetSdk = 31 + targetSdk = 34 versionCode = 1306 versionName = "1.3.6" ndk { @@ -38,6 +38,7 @@ android { isDefault = true } } + namespace = "mx.trackermap.TrackerMap.android" } val googleImplementation by configurations diff --git a/androidApp/src/google/AndroidManifest.xml b/androidApp/src/google/AndroidManifest.xml index 5207ee9..c666fc8 100644 --- a/androidApp/src/google/AndroidManifest.xml +++ b/androidApp/src/google/AndroidManifest.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="mx.trackermap.TrackerMap.android"> + xmlns:tools="http://schemas.android.com/tools"> <application android:name=".GoogleMainApplication" diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml index 313a4df..d058321 100644 --- a/androidApp/src/main/AndroidManifest.xml +++ b/androidApp/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest - xmlns:android="http://schemas.android.com/apk/res/android" - package="mx.trackermap.TrackerMap.android"> + xmlns:android="http://schemas.android.com/apk/res/android"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> diff --git a/build.gradle.kts b/build.gradle.kts index 21ecdbc..8e8e9d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,10 +6,10 @@ buildscript { maven("https://jitpack.io") } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.6.0") - classpath("com.android.tools.build:gradle:7.0.4") - classpath("com.google.gms:google-services:4.3.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.20") + classpath("com.android.tools.build:gradle:7.4.2") + classpath("com.google.gms:google-services:4.3.15") } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cede901..6c26f1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Dec 03 21:13:43 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 2488cde..960c51d 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -66,4 +66,5 @@ android { abiFilters += listOf("armeabi-v7a", "arm64-v8a") } } + namespace = "mx.trackermap.TrackerMap" }
\ No newline at end of file diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml index f480b0f..568741e 100644 --- a/shared/src/androidMain/AndroidManifest.xml +++ b/shared/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest package="mx.trackermap.TrackerMap" />
\ No newline at end of file +<manifest />
\ No newline at end of file |