Merge pull request #507 from jakepurple13/develop

Update
jakepurple13 · Jul 11, 2022 · 43ea241 · 43ea241
2 parents 4f97cc7 + 95f266d
commit 43ea241
Show file tree

Hide file tree

Showing 104 changed files with 12,103 additions and 7,179 deletions.
diff --git a/.github/workflows/build_check.yaml b/.github/workflows/build_check.yaml
@@ -1,5 +1,5 @@
 name: Minimal Android CI Workflow
- 
+
 on:
   #push:
   #  branches:
@@ -8,7 +8,7 @@ on:
   #  paths-ignore:
   #    - '.github/**'
   pull_request:
-    types: [assigned, opened, synchronize, reopened]
+    types: [ assigned, opened, synchronize, reopened ]
     branches:
       - develop
       - master
@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
-        
+
       - run: echo $ANIME_GOOGLE_SERVICES_JSON > animeworld/google-services.json
         env:
           ANIME_GOOGLE_SERVICES_JSON: ${{ secrets.ANIME_SERVICES }}
@@ -44,31 +44,146 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Build APK
-        run: bash ./gradlew assembleDebug --stacktrace
-
-      - name: Upload APK
-        uses: actions/upload-artifact@v1
-        with:
-          name: apk
-          path: animeworld/build/outputs/apk/debug/animeworld-debug.apk
-      - name: Upload APK
-        uses: actions/upload-artifact@v1
-        with:
-          name: apk
-          path: mangaworld/build/outputs/apk/debug/mangaworld-debug.apk
-      - name: Upload APK
-        uses: actions/upload-artifact@v1
-        with:
-          name: apk
-          path: novelworld/build/outputs/apk/debug/novelworld-debug.apk
-      - name: Upload APK
-        uses: actions/upload-artifact@v1
-        with:
-          name: apk
-          path: animeworldtv/build/outputs/apk/debug/animeworldtv-debug.apk
-      - name: Upload APK
-        uses: actions/upload-artifact@v1
-        with:
-          name: apk
-          path: otakumanager/build/outputs/apk/debug/otakumanager-debug.apk
+
+      - name: Build all artifacts
+        id: buildAllApks
+        uses: eskatos/gradle-command-action@v1.3.3
+        with:
+          gradle-version: current
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+          arguments: assembleRelease
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: manga_sign
+        with:
+          releaseDirectory: mangaworld/build/outputs/apk/full/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: manga_sign_no_firebase
+        with:
+          releaseDirectory: mangaworld/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: anime_sign
+        with:
+          releaseDirectory: animeworld/build/outputs/apk/full/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: anime_sign_no_firebase
+        with:
+          releaseDirectory: animeworld/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: novel_sign
+        with:
+          releaseDirectory: novelworld/build/outputs/apk/full/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: novel_sign_no_firebase
+        with:
+          releaseDirectory: novelworld/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: animetv_sign
+        with:
+          releaseDirectory: animeworldtv/build/outputs/apk/full/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: animetv_sign_no_firebase
+        with:
+          releaseDirectory: animeworldtv/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Clean up build artifacts
+        run: |
+          cp ${{ steps.manga_sign.outputs.signedReleaseFile }} mangaworld-release.apk
+          cp ${{ steps.anime_sign.outputs.signedReleaseFile }} animeworld-release.apk
+          cp ${{ steps.novel_sign.outputs.signedReleaseFile }} novelworld-release.apk
+          cp ${{ steps.animetv_sign.outputs.signedReleaseFile }} animeworldtv-release.apk
+          cp ${{ steps.manga_sign_no_firebase.outputs.signedReleaseFile }} mangaworld-no-firebase-release.apk
+          cp ${{ steps.anime_sign_no_firebase.outputs.signedReleaseFile }} animeworld-no-firebase-release.apk
+          cp ${{ steps.novel_sign_no_firebase.outputs.signedReleaseFile }} novelworld-no-firebase-release.apk
+          cp ${{ steps.animetv_sign_no_firebase.outputs.signedReleaseFile }} animeworldtv-no-firebase-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Manga App
+          path: mangaworld-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Anime App
+          path: animeworld-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Novel App
+          path: novelworld-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed AnimeTV App
+          path: animeworldtv-release.apk
+
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Manga No Firebase App
+          path: mangaworld-no-firebase-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Anime No Firebase App
+          path: animeworld-no-firebase-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Novel No Firebase App
+          path: novelworld-no-firebase-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed AnimeTV No Firebase App
+          path: animeworldtv-no-firebase-release.apk
+
diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
@@ -44,7 +44,7 @@ jobs:
         id: buildAllApks
         uses: eskatos/gradle-command-action@v1.3.3
         with:
-          gradle-version: 7.0.2
+          gradle-version: current
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
@@ -54,7 +54,7 @@ jobs:
         name: Sign app APK
         id: manga_sign
         with:
-          releaseDirectory: mangaworld/build/outputs/apk/release
+          releaseDirectory: mangaworld/build/outputs/apk/full/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -64,7 +64,7 @@ jobs:
         name: Sign app APK
         id: anime_sign
         with:
-          releaseDirectory: animeworld/build/outputs/apk/release
+          releaseDirectory: animeworld/build/outputs/apk/full/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -74,7 +74,7 @@ jobs:
         name: Sign app APK
         id: novel_sign
         with:
-          releaseDirectory: novelworld/build/outputs/apk/release
+          releaseDirectory: novelworld/build/outputs/apk/full/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
@@ -84,31 +84,74 @@ jobs:
         name: Sign app APK
         id: animetv_sign
         with:
-          releaseDirectory: animeworldtv/build/outputs/apk/release
+          releaseDirectory: animeworldtv/build/outputs/apk/full/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - uses: r0adkll/sign-android-release@v1
         name: Sign app APK
-        id: otakumanager_sign
+        id: manga_sign_no_firebase
         with:
-          releaseDirectory: otakumanager/build/outputs/apk/release
+          releaseDirectory: mangaworld/build/outputs/apk/noFirebase/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: anime_sign_no_firebase
+        with:
+          releaseDirectory: animeworld/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: novel_sign_no_firebase
+        with:
+          releaseDirectory: novelworld/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign app APK
+        id: animetv_sign_no_firebase
+        with:
+          releaseDirectory: animeworldtv/build/outputs/apk/noFirebase/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      #      - uses: r0adkll/sign-android-release@v1
+      #        name: Sign app APK
+      #        id: otakumanager_sign
+      #        with:
+      #          releaseDirectory: otakumanager/build/outputs/apk/release
+      #          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+      #          alias: ${{ secrets.ALIAS }}
+      #          keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
+      #          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
       # ${{steps.sign_app.outputs.signedReleaseFile}}
       - name: Clean up build artifacts
         run: |
           cp ${{ steps.manga_sign.outputs.signedReleaseFile }} mangaworld-release.apk
           cp ${{ steps.anime_sign.outputs.signedReleaseFile }} animeworld-release.apk
           cp ${{ steps.novel_sign.outputs.signedReleaseFile }} novelworld-release.apk
           cp ${{ steps.animetv_sign.outputs.signedReleaseFile }} animeworldtv-release.apk
-          cp ${{ steps.otakumanager_sign.outputs.signedReleaseFile }} otakumanager-release.apk
 
+          cp ${{ steps.manga_sign_no_firebase.outputs.signedReleaseFile }} mangaworld-no-firebase-release.apk
+          cp ${{ steps.anime_sign_no_firebase.outputs.signedReleaseFile }} animeworld-no-firebase-release.apk
+          cp ${{ steps.novel_sign_no_firebase.outputs.signedReleaseFile }} novelworld-no-firebase-release.apk
+          cp ${{ steps.animetv_sign_no_firebase.outputs.signedReleaseFile }} animeworldtv-no-firebase-release.apk
 
       - uses: actions/upload-artifact@v2
         with:
@@ -130,10 +173,31 @@ jobs:
           name: Signed AnimeTV App
           path: animeworldtv-release.apk
 
+      #      - uses: actions/upload-artifact@v2
+      #        with:
+      #          name: Signed OtakuManager App
+      #          path: otakumanager-release.apk
+
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Manga No Firebase App
+          path: mangaworld-no-firebase-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Anime No Firebase App
+          path: animeworld-no-firebase-release.apk
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Signed Novel No Firebase App
+          path: novelworld-no-firebase-release.apk
+
       - uses: actions/upload-artifact@v2
         with:
-          name: Signed OtakuManager App
-          path: otakumanager-release.apk
+          name: Signed AnimeTV No Firebase App
+          path: animeworldtv-no-firebase-release.apk
 
           #       - name: Upload APK
           #         uses: actions/upload-artifact@v1
@@ -174,10 +238,27 @@ jobs:
        uses: actions/download-artifact@v1
        with:
          name: Signed AnimeTV App
+
+     - name: Download APK from build
+       uses: actions/download-artifact@v1
+       with:
+         name: Signed Anime No Firebase App
      - name: Download APK from build
        uses: actions/download-artifact@v1
        with:
-         name: Signed OtakuManager App
+         name: Signed Manga No Firebase App
+     - name: Download APK from build
+       uses: actions/download-artifact@v1
+       with:
+         name: Signed Novel No Firebase App
+     - name: Download APK from build
+       uses: actions/download-artifact@v1
+       with:
+         name: Signed AnimeTV No Firebase App
+      #     - name: Download APK from build
+      #       uses: actions/download-artifact@v1
+      #       with:
+      #         name: Signed OtakuManager App
 
      - name: Get tag name
        id: get_tag_name
@@ -194,11 +275,15 @@ jobs:
          tag_name: ${{ env.VERSION_TAG }}
          name: Release ${{ env.VERSION_TAG }}
          files: |
-            Signed Manga App/mangaworld-release.apk
-            Signed Anime App/animeworld-release.apk
-            Signed Novel App/novelworld-release.apk
-            Signed AnimeTV App/animeworldtv-release.apk
-            Signed OtakuManager App/otakumanager-release.apk
+           Signed Manga App/mangaworld-release.apk
+           Signed Anime App/animeworld-release.apk
+           Signed Novel App/novelworld-release.apk
+           Signed AnimeTV App/animeworldtv-release.apk
+
+           Signed Manga No Firebase App/mangaworld-no-firebase-release.apk
+           Signed Anime No Firebase App/animeworld-no-firebase-release.apk
+           Signed Novel No Firebase App/novelworld-no-firebase-release.apk
+           Signed AnimeTV No Firebase App/animeworldtv-no-firebase-release.apk
 
      - name: Discord notification
        env: