Update workflows to generate android.jar on demand

.github/workflows/build_pull_request.yml

@@ -30,30 +30,24 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-          path: master
-          fetch-depth: 0
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Copy CI gradle.properties
         run: |
-          cd master
           mkdir -p ~/.gradle
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Download android.jar
+      - name: Generate android.jar
         run: |
-          cd master
+          ./AndroidCompat/getAndroid.sh
-          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Build and copy webUI, Build Jar
+      - name: Build project
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: master
-          wrapper-directory: master
           arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true

.github/workflows/build_push.yml

@@ -18,7 +18,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build artifacts and deploy preview
+    name: Build project
     needs: check_wrapper
     runs-on: ubuntu-latest
 
@@ -30,32 +30,24 @@ jobs:
 
       - name: Checkout master branch
         uses: actions/checkout@v2
-        with:
-          ref: master
-          path: master
-          fetch-depth: 0
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Copy CI gradle.properties
         run: |
-          cd master
           mkdir -p ~/.gradle
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Download android.jar
+      - name: Generate android.jar
         run: |
-          cd master
+          ./AndroidCompat/getAndroid.sh
-          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Build and copy webUI, Build Jar
+      - name: Build project
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: master
-          wrapper-directory: master
           arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true

.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
   build:
-    name: Build artifacts and release
+    name: Build artifacts and create draft release
     needs: check_wrapper
     runs-on: ubuntu-latest
 
@@ -32,30 +32,24 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ github.ref }}
-          path: master
-          fetch-depth: 0
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Copy CI gradle.properties
         run: |
-          cd master
           mkdir -p ~/.gradle
           cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Download android.jar
+      - name: Generate android.jar
         run: |
-          cd master
+          ./AndroidCompat/getAndroid.sh
-          curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Build and copy webUI, Build Jar
+      - name: Build project
         uses: eskatos/gradle-command-action@v1
         with:
-          build-root-directory: master
-          wrapper-directory: master
           arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
@@ -66,7 +60,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          file: "master/server/build/*.jar"
+          file: "server/build/*.jar"
           tags: true
           draft: true
           verbose: true