Gradle improvements

mapsforge · Dec 1, 2023 · 8723875 · 8723875
1 parent 59074ec
commit 8723875
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle
@@ -22,19 +22,21 @@ sourceSets {
     main.resources.srcDirs = ['resources']
 }
 
-mainClassName = "org.oscim.test.MapsforgeTest"
-run {
-    if (project.hasProperty("args")) {
-        args project.getProperty("args").split(",")
+application {
+    mainClass = "org.oscim.test.MapsforgeTest"
+    run {
+        if (project.hasProperty("args")) {
+            args project.getProperty("args").split(",")
+        }
     }
-}
 
-task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
-    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 {
-        attributes 'Main-Class': "${mainClassName}"
+    task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
+        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 {
+            attributes 'Main-Class': "${mainClass}"
+        }
+        with jar
     }
-    with jar
 }
diff --git a/vtm-theme-comparator/build.gradle b/vtm-theme-comparator/build.gradle
@@ -23,14 +23,16 @@ sourceSets {
     main.resources.srcDirs = ['resources']
 }
 
-mainClassName = "org.oscim.theme.comparator.Main"
+application {
+    mainClass = "org.oscim.theme.comparator.Main"
 
-task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
-    archiveClassifier = 'jar-with-dependencies'
-    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
-    exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
-    manifest {
-        attributes 'Main-Class': "${mainClassName}"
+    task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
+        archiveClassifier = 'jar-with-dependencies'
+        from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+        exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
+        manifest {
+            attributes 'Main-Class': "${mainClass}"
+        }
+        with jar
     }
-    with jar
 }