fixes gradle properties

janbar · Feb 3, 2024 · ea655b8 · ea655b8
1 parent f490b2f
commit ea655b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/build_android_arm64_ndk22.yml b/.github/workflows/build_android_arm64_ndk22.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
         with:
-          packages: "platform-tools platforms;android-29 build-tools;29.0.2 ndk;22.1.7171670"
+          packages: "platform-tools platforms;android-29 build-tools;28.0.3 ndk;22.1.7171670"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
       - name: Cache Qt
@@ -40,8 +40,9 @@ jobs:
           modules: android 
           install-deps: 'true'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
-      - name: Dump Qt DIR
-        run:  echo ${Qt5_DIR}
+      - name: Fix gradle properties
+        run:  "sed -e 's/gradle-5.6.4-bin.zip/gradle-7.3-bin.zip/' --in-place=.bak
+                   ${Qt5_DIR}/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties"
       - name: Init submodules
         run: git submodule init && git submodule update
       - name: Configure build

diff --git a/.github/workflows/build_android_x64_ndk22.yml b/.github/workflows/build_android_x64_ndk22.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
         with:
-          packages: "platform-tools platforms;android-29 build-tools;29.0.2 ndk;22.1.7171670"
+          packages: "platform-tools platforms;android-29 build-tools;28.0.3 ndk;22.1.7171670"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
       - name: Cache Qt
@@ -42,8 +42,9 @@ jobs:
           modules: android 
           install-deps: 'true'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
-      - name: Dump Qt DIR
-        run:  echo ${Qt5_DIR}
+      - name: Fix gradle properties
+        run:  "sed -e 's/gradle-5.6.4-bin.zip/gradle-7.3-bin.zip/' --in-place=.bak
+                   ${Qt5_DIR}/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties"
       - name: Init submodules
         run: git submodule init && git submodule update
       - name: Configure build

diff --git a/.github/workflows/build_android_x86_ndk22.yml b/.github/workflows/build_android_x86_ndk22.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
         with:
-          packages: "platform-tools platforms;android-29 build-tools;29.0.2 ndk;22.1.7171670"
+          packages: "platform-tools platforms;android-29 build-tools;28.0.3 ndk;22.1.7171670"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
       - name: Cache Qt
@@ -40,8 +40,9 @@ jobs:
           modules: android 
           install-deps: 'true'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
-      - name: Dump Qt DIR
-        run:  echo ${Qt5_DIR}
+      - name: Fix gradle properties
+        run:  "sed -e 's/gradle-5.6.4-bin.zip/gradle-7.3-bin.zip/' --in-place=.bak
+                   ${Qt5_DIR}/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties"
       - name: Init submodules
         run: git submodule init && git submodule update
       - name: Configure build