Update Gradle

mapsforge · Apr 14, 2023 · eef8ee3 · eef8ee3
1 parent 6342756
commit eef8ee3
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.oscim.android.test"
     android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0">

diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
@@ -24,6 +24,7 @@ dependencies {
 }
 
 android {
+    namespace 'org.oscim.android.test'
     compileSdk androidCompileSdk()
 
     compileOptions {

diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle
@@ -13,7 +13,7 @@ sourceSets {
 
 file('natives').eachDir() { dir ->
     task("nativesJar-${dir.name}", type: Jar) {
-        classifier "natives-${dir.name}"
+        archiveClassifier = "natives-${dir.name}"
         from(dir.path)
     }
 }

diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle
@@ -13,7 +13,7 @@ sourceSets {
 
 file('natives').eachDir() { dir ->
     task("nativesJar-${dir.name}", type: Jar) {
-        classifier "natives-${dir.name}"
+        archiveClassifier = "natives-${dir.name}"
         from(dir.path)
     }
 }

diff --git a/vtm-app/AndroidManifest.xml b/vtm-app/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.oscim.app"
     android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0">

diff --git a/vtm-app/build.gradle b/vtm-app/build.gradle
@@ -10,6 +10,7 @@ dependencies {
 }
 
 android {
+    namespace 'org.oscim.app'
     compileSdk androidCompileSdk()
 
     compileOptions {

diff --git a/vtm-desktop/build.gradle b/vtm-desktop/build.gradle
@@ -12,7 +12,7 @@ sourceSets {
 
 file('natives').eachDir() { dir ->
     task("nativesJar-${dir.name}", type: Jar) {
-        classifier "natives-${dir.name}"
+        archiveClassifier = "natives-${dir.name}"
         from(dir.path)
     }
 }

diff --git a/vtm-ios/build.gradle b/vtm-ios/build.gradle
@@ -52,7 +52,7 @@ tasks.withType(JavaCompile) {
 
 task nativesJar(type: Jar) {
     dependsOn copyVtmResources, copyVtmThemesResources
-    classifier 'natives'
+    archiveClassifier = 'natives'
     from('natives')
 }
 

diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle
@@ -30,7 +30,7 @@ run {
 }
 
 task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
-    classifier 'jar-with-dependencies'
+    archiveClassifier = 'jar-with-dependencies'
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/services/io.jeo.data.Driver'
     manifest {

diff --git a/vtm-theme-comparator/build.gradle b/vtm-theme-comparator/build.gradle
@@ -26,7 +26,7 @@ sourceSets {
 mainClassName = "org.oscim.theme.comparator.Main"
 
 task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
-    classifier 'jar-with-dependencies'
+    archiveClassifier = 'jar-with-dependencies'
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
     manifest {