From 58991132df2259781dde6c9f51d1f481bce6fe8e Mon Sep 17 00:00:00 2001
From: Artem Chepurnyi <mail@artemchep.com>
Date: Thu, 8 Aug 2024 07:32:06 +0300
Subject: [PATCH] chore: Migrate to setup-gradle-v4

---
 .github/workflows/new_apk.yaml                     | 14 +++++---------
 .../new_daily_tag_play_store_internal_track.yaml   | 14 +++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/new_apk.yaml b/.github/workflows/new_apk.yaml
index dd051007..41b62c64 100644
--- a/.github/workflows/new_apk.yaml
+++ b/.github/workflows/new_apk.yaml
@@ -24,19 +24,15 @@ jobs:
           echo "" >> gradle.properties
           echo "versionRef=$(git rev-parse --short HEAD)" >> gradle.properties
           echo buildkonfig.flavor=release >> gradle.properties
-      - name: "Check and Build licenses"
-        uses: gradle/actions/setup-gradle@v4
-        env:
-          JAVA_HOME: ${{ steps.setup-java.outputs.path }}
-        with:
-          arguments: :androidApp:licenseeAndroidNoneRelease
-      - name: "Move licenses"
-        run: |
-          mv -f androidApp/build/reports/licensee/androidNoneRelease/artifacts.json common/src/commonMain/composeResources/files/licenses.json
       - name: "Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         env:
           JAVA_HOME: ${{ steps.setup-java.outputs.path }}
+      - name: "Check and Build licenses"
+        run: ./gradlew :androidApp:licenseeAndroidNoneRelease
+      - name: "Move licenses"
+        run: |
+          mv -f androidApp/build/reports/licensee/androidNoneRelease/artifacts.json common/src/commonMain/composeResources/files/licenses.json
       - name: "Build"
         run: ./gradlew :androidApp:assembleNoneRelease
       - name: 'Upload .apk'
diff --git a/.github/workflows/new_daily_tag_play_store_internal_track.yaml b/.github/workflows/new_daily_tag_play_store_internal_track.yaml
index 285e6488..2c8a1985 100644
--- a/.github/workflows/new_daily_tag_play_store_internal_track.yaml
+++ b/.github/workflows/new_daily_tag_play_store_internal_track.yaml
@@ -23,19 +23,15 @@ jobs:
           echo ${{ secrets.GOOGLE_SERVICES }} | base64 -d | zcat >> androidApp/google-services.json
           echo ${{ secrets.SERVICE_ACCOUNT_B64 }} | base64 -d | zcat >> service-account-google.json
           python .github/setup_gradle_properties_release.py tag=${{ github.ref_name }}
-      - name: "Check and Build licenses"
-        uses: gradle/actions/setup-gradle@v4
-        env:
-          JAVA_HOME: ${{ steps.setup-java.outputs.path }}
-        with:
-          arguments: :androidApp:licenseeAndroidPlayStoreRelease
-      - name: "Move licenses"
-        run: |
-          mv -f androidApp/build/reports/licensee/androidPlayStoreRelease/artifacts.json common/src/commonMain/composeResources/files/licenses.json
       - name: "Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         env:
           JAVA_HOME: ${{ steps.setup-java.outputs.path }}
+      - name: "Check and Build licenses"
+        run: ./gradlew :androidApp:licenseeAndroidPlayStoreRelease
+      - name: "Move licenses"
+        run: |
+          mv -f androidApp/build/reports/licensee/androidPlayStoreRelease/artifacts.json common/src/commonMain/composeResources/files/licenses.json
       - name: "Build"
         run: ./gradlew :androidApp:bundlePlayStoreRelease
       - name: 'Upload .aab'