From 1822d5696a6269b0d29415a0cb6f4bac4a82cddc Mon Sep 17 00:00:00 2001
From: gruve-p <jackielove4u@hotmail.com>
Date: Tue, 26 Nov 2024 23:30:45 +0100
Subject: [PATCH] Try fixing github action

---
 .github/workflows/gradle6.yml | 57 -----------------------------------
 .github/workflows/gradle7.yml | 14 ++++-----
 2 files changed, 7 insertions(+), 64 deletions(-)
 delete mode 100644 .github/workflows/gradle6.yml

diff --git a/.github/workflows/gradle6.yml b/.github/workflows/gradle6.yml
deleted file mode 100644
index 8162039edc..0000000000
--- a/.github/workflows/gradle6.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Gradle6
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        java: ['11']
-        distribution: ['temurin']
-        gradle: ['6.7.1']
-      fail-fast: false
-    name: JAVA ${{ matrix.java }} OS ${{ matrix.os }} Gradle ${{ matrix.gradle }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Downgrade Android plugin from 7.4.1 to 4.2.0
-        run:  sed -i -e "s|7.4.1|4.2.0|g" build.gradle
-
-      - name: Downgrade DistributionUrl from Gradle 7.5.1 to Gradle 6.7.1
-        run:  sed -i -e "s|7.5.1|6.7.1|g" gradle/wrapper/gradle-wrapper.properties
-
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.java }}
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2.0.10
-
-      - name: Install build-tools 33.0.2, platformtools and platform android-33
-        run: sdkmanager --install "build-tools;33.0.2" "platform-tools" "platforms;android-33"
-
-      - name: Fix build tools 33.0.2 issue
-        run: |
-           ln -s ${ANDROID_HOME}/build-tools/33.0.2/d8 ${ANDROID_HOME}/build-tools/33.0.2/dx
-           ln -s ${ANDROID_HOME}/build-tools/33.0.2/lib/d8.jar ${ANDROID_HOME}/build-tools/33.0.2/lib/dx.jar
-
-      - name: Build with Gradle
-        run: |
-           ./gradlew wrapper --gradle-version=${{ matrix.gradle }}
-           ./gradlew clean build --stacktrace
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}
-          path: |
-            wallet/build/outputs/apk/
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}
diff --git a/.github/workflows/gradle7.yml b/.github/workflows/gradle7.yml
index e4c40c02fc..6c8e6223da 100644
--- a/.github/workflows/gradle7.yml
+++ b/.github/workflows/gradle7.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['11', '17']
+        java: ['17', '18']
         distribution: ['temurin']
         gradle: ['7.5.1']
       fail-fast: false
@@ -17,16 +17,16 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2.0.10
+        uses: android-actions/setup-android@v3
 
-      - name: Install build-tools 33.0.2, platformtools and platform android-33
-        run: sdkmanager --install "build-tools;33.0.2" "platform-tools" "platforms;android-33"
+      - name: Install build-tools 35.0.0, platformtools and platform android-33
+        run: sdkmanager --install "build-tools;35.0.0" "platform-tools" "platforms;android-35"
 
       - name: Build with Gradle
         run: |
@@ -34,13 +34,13 @@ jobs:
            ./gradlew clean build --stacktrace
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}
           path: |
             wallet/build/outputs/apk/
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}