From 4b39e6ea6600499c6b1ec1cd9fd2729fb41abccd Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Wed, 6 Oct 2021 16:57:46 +0200
Subject: [PATCH 1/3] Update JDK and build brouter-routing-app (android)

---
 .github/workflows/gradle.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index cd9d3f0..b0de3a6 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,11 +16,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'zulu'
         cache: gradle
+    - name: Create local.properties
+      run: touch local.properties
     - name: Build with Gradle
       run: ./gradlew build

From abb338afc9e6d0986e023bcba3ab299815c6efa2 Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Fri, 8 Oct 2021 16:43:37 +0200
Subject: [PATCH 2/3] Upload brouter-*.zip as artifact

---
 .github/workflows/gradle.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b0de3a6..f27ddf3 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -26,3 +26,8 @@ jobs:
       run: touch local.properties
     - name: Build with Gradle
       run: ./gradlew build
+    - name: Upload ZIP
+      uses: actions/upload-artifact@v2
+      with:
+        name: ZIP
+        path: brouter-server/build/distributions/brouter-*.zip

From 31736586908acb26ba91e9442360fe255f79ef7c Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Mon, 11 Oct 2021 16:51:17 +0200
Subject: [PATCH 3/3] Make distZip depend on fatJar

---
 brouter-server/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/brouter-server/build.gradle b/brouter-server/build.gradle
index e5e4aa2..1cc9361 100644
--- a/brouter-server/build.gradle
+++ b/brouter-server/build.gradle
@@ -30,7 +30,8 @@ application {
 }
 
 distZip {
-     archiveFileName = 'brouter-' + project.version + '.zip'
+    dependsOn fatJar
+    archiveFileName = 'brouter-' + project.version + '.zip'
 }
 
 distributions {