Update

errr-maxx-builds · Nov 28, 2023 · 8902421 · 8902421
1 parent bb7c72a
commit 8902421
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,16 +26,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: errr-maxx-builds/android-setup-build-env@master
+        with:
+          usePatchedSDK: true # custom
 
       - run: |
-          APP_VERSION="v$(gradle -q printVersionName)" || APP_VERSION="v$(cat ./app/build.gradle.kts ./app/build.gradle | grep -m1 versionName | awk -F'"' '{ print $2; }')" || true
+          APP_VERSION="v$(./gradlew -q printVersionName)" || APP_VERSION="v$(cat ./app/build.gradle.kts ./app/build.gradle | grep -m1 versionName | awk -F'"' '{ print $2; }')" || true
           echo APP_VERSION="$APP_VERSION" >> "$GITHUB_ENV"
           echo APP_NAME="${{ github.event.repository.name }}_${APP_VERSION}" >> "$GITHUB_ENV"
         shell: bash
 
-      - uses: errr-maxx-builds/android-setup-build-env@master
-        with:
-          usePatchedSDK: true # custom
       - run: ./gradlew assembleDebug
 
       - run: mv ./app/build/outputs/apk/debug/app-debug.apk "./${{ env.APP_NAME }}.apk"

diff --git a/app/build.gradle b/app/build.gradle
@@ -43,6 +43,12 @@ android {
     namespace 'tk.zwander.wifilist'
 }
 
+task printVersionName {
+    doLast {
+        println android.defaultConfig.versionName
+    }
+}
+
 dependencies {
     implementation 'androidx.core:core-ktx:1.10.0'
     implementation "androidx.compose.ui:ui:$compose_version"