From c1d80e0e5ee1e6ef8ca2488cb2927fbbc7b870a7 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 16 Feb 2020 23:50:32 +0100
Subject: [PATCH] merge test and bugfix

---
 allinone/build.gradle    | 3 +++
 allinone/settings.gradle | 7 -------
 gradle.properties        | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/allinone/build.gradle b/allinone/build.gradle
index b92553e7..87dbe05a 100644
--- 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
index e8ba977d..841f2d00 100644
--- 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
index 9a3d5230..67f00570 100644
--- 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