merge test and bugfix

Computer-Kurzweil · Feb 16, 2020 · c1d80e0 · c1d80e0
1 parent 30db0d2
commit c1d80e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/allinone/build.gradle b/allinone/build.gradle
@@ -25,6 +25,9 @@ shadowJar {
     manifest {
         attributes "Main-Class": "org.woehlke.computer.kurzweil.ComputerKurzweilApplication"
     }
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
 
 jar {

diff --git a/allinone/settings.gradle b/allinone/settings.gradle
@@ -1,8 +1 @@
-pluginManagement {
-    plugins {
-        id 'com.github.johnrengelman.shadow' version "${shadowPluginVersion}"
-    }
-}
-
-
 rootProject.name = 'computer_kurzweil'
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-systemProp.java.runtime.version=11
+systemProp.java.runtime.version=13
 systemProp.spring.profiles.active=default
 #org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseContainerSupport
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,9 @@ shadowJar { @@
         manifest {
             attributes "Main-Class": "org.woehlke.computer.kurzweil.ComputerKurzweilApplication"
         }
+        from {
+            configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        }
     }
     jar {
@@ Expand Down @@