From 899e134a62f7cfbc82afa425fdc28f97a6197ba3 Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@azib.net>
Date: Thu, 26 Dec 2019 11:36:55 +0200
Subject: [PATCH] use a better message when rt.jar is not found

---
 .github/workflows/main.yml | 2 ++
 build.gradle               | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 40dc37d5..cb6f8aca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,5 +12,7 @@ jobs:
       with:
         java-version: '8'
         architecture: x64
+    - name: Find rt.jar in Zulu
+      run: find $JAVA_HOME
     - name: Build
       run: ./gradlew linux64
diff --git a/build.gradle b/build.gradle
index 769e264e..6699f810 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,16 +97,16 @@ def packageTask(def platform, def moreJars, def moreLibs, Closure doMore) {
         with jar
 
         def rtJar = new File(System.getProperty('java.home') + "/jre/lib/rt.jar")
-        if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-10-openjdk-amd64/jmods/java.base.jmod') // try Ubuntu version of Java 10
-        if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-8-oracle/jre/lib/rt.jar') // try Ubuntu version of Java 8 if current Java doesn't have rt.jar
-        if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/rt.jar') // try Ubuntu version of OpenJDK 8
+        if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-11-openjdk-amd64/jmods/java.base.jmod') // try Debian/Ubuntu version of Java 11
+        if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-8-oracle/jre/lib/rt.jar') // try Debian/Ubuntu version of Java 8 if current Java doesn't have rt.jar
+        if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/rt.jar') // try Debian/Ubuntu version of OpenJDK 8
 
         if (rtJar.exists()) {
             print "Using $rtJar for proguard minimization"
             finalizedBy minimizeTask(rtJar, platform, doMore)
         }
         else {
-            println "WARNING: not minimizing, Java 8 is currently required for that"
+            println "WARNING: not minimizing, Java8 rt.jar not found on the system"
             doLast(doMore)
         }
     }