Merge pull request #4 from Groestlcoin/upgrade-10.x

Upgrade to 10.x

.github/workflows/gradle6.yml

@@ -7,40 +7,51 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        java: ['8', '11']
+        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@v1
+      - uses: actions/checkout@v3
 
-      - run:  sed -i -e "s|7.2.0|4.2.2|g" build.gradle
+      - 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@v2
+        uses: actions/setup-java@v3
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/[email protected]
+
+      - 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 wrapper --gradle-version=${{ matrix.gradle }}
-           ./gradlew clean build
+           ./gradlew clean build --stacktrace
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        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@v2
+        uses: actions/download-artifact@v3
         with:
           name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}

.github/workflows/gradle7.yml

@@ -10,37 +10,37 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         java: ['11', '17']
         distribution: ['temurin']
-        gradle: ['7.4.2']
+        gradle: ['7.5.1']
       fail-fast: false
     name: JAVA ${{ matrix.java }} OS ${{ matrix.os }} Gradle ${{ matrix.gradle }}
     steps:
-      - uses: actions/checkout@v1
-
-      - run:  sed -i -e "s|7.2.0|7.2.1|g" build.gradle
+      - uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/[email protected]
+
+      - 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: Build with Gradle
         run: |
            ./gradlew wrapper --gradle-version=${{ matrix.gradle }}
-           ./gradlew wrapper --gradle-version=${{ matrix.gradle }}
-           ./gradlew clean build
+           ./gradlew clean build --stacktrace
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        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@v2
+        uses: actions/download-artifact@v3
         with:
           name: groestlcoin-wallet-JAVA${{ matrix.java }}-${{ matrix.os }}-${{ matrix.gradle }}

.gitlab-ci.yml

@@ -1,24 +1,56 @@
-image: ubuntu:focal
-
 variables:
-  ANDROID_HOME:             "$PWD/android-sdk"
-  ANDROID_SDK_TOOLS:        "7583922_latest"
-  ANDROID_SDK_LICENSE_HASH: "24333f8a63b6825ea9c5514f83c2829b004d1fee"
+  ANDROID_HOME: $PWD/android-sdk
 
 before_script:
   - apt-get update
-  - apt-get -y upgrade
-  - apt-get -y install ${JDK_PACKAGE}
-  - apt-get -y install wget gradle
-  - wget --quiet --output-document=commandlinetools-linux.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}.zip
-  - mkdir -p ${ANDROID_HOME}
-  - unzip -d ${ANDROID_HOME} commandlinetools-linux.zip
-  - mkdir -p ${ANDROID_HOME}/licenses
-  - echo -e "\n${ANDROID_SDK_LICENSE_HASH}" >> ${ANDROID_HOME}/licenses/android-sdk-license
 
-build:
-  parallel:
-    matrix:
-      - JDK_PACKAGE: [ openjdk-8-jdk, openjdk-11-jdk ]
+after_script:
+  - gradle --version
+
+bullseye-jdk11:
+  image: debian:bullseye-backports
+  script:
+    - apt-get -y install openjdk-11-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
+    - gradle build --stacktrace
+  artifacts:
+    name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+    paths:
+      - wallet/build/outputs/apk/**/*.apk
+
+bookworm-jdk17:
+  image: debian:bookworm-slim
+  script:
+    - apt-get -y install openjdk-17-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
+    - gradle build --stacktrace
+  artifacts:
+    name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+    paths:
+      - wallet/build/outputs/apk/**/*.apk
+
+jammy-jdk11:
+  image: ubuntu:jammy
+  script:
+    - apt-get -y install openjdk-11-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
+    - gradle build --stacktrace
+  artifacts:
+    name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+    paths:
+      - wallet/build/outputs/apk/**/*.apk
+
+lunar-jdk17:
+  image: ubuntu:lunar
   script:
+    - apt-get -y install openjdk-17-jdk-headless
+    - apt-get -y install sdkmanager gradle
+    - yes | sdkmanager --licenses >/dev/null || true
     - gradle build --stacktrace
+  artifacts:
+    name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+    paths:
+      - wallet/build/outputs/apk/**/*.apk

README.md

@@ -8,21 +8,15 @@ This project contains several sub-projects:
      The Android app itself. This is probably what you're searching for.
  * __market__:
      App description and promo material for the Google Play app store.
- * __integration-android__:
-     A tiny library for integrating digitial payments into your own Android app
-     (e.g. donations, in-app purchases).
- * __sample-integration-android__:
-     A minimal example app to demonstrate integration of digital payments into
-     your Android app.
 
 
 ### PREREQUISITES FOR BUILDING
 
-You'll need git, a Java 8 or 11 SDK and Gradle 4.4 (or later) for this. We'll assume Ubuntu 20.04 LTS (Focal Fossa)
-for the package installs, which comes with OpenJDK 8, OpenJDK 11 and Gradle 4.4.1 out of the box.
+You'll need git, a Java 11 SDK and Gradle between 4.4 and 6.9.x for this. We'll assume Ubuntu 22.04 LTS (Jammy Jellyfish)
+for the package installs, which comes with OpenJDK 11 and Gradle 4.4.1 out of the box.
 
     # first time only
-    sudo apt install git gradle openjdk-8-jdk
+    sudo apt install git gradle openjdk-11-jdk
 
 Create a directory for the Android SDK (e.g. `android-sdk`) and point the `ANDROID_HOME` variable to it.
 

build.gradle

@@ -6,9 +6,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         //noinspection GradleDependency
-        classpath 'net.sf.proguard:proguard-gradle:6.0.3'
+        classpath 'net.sf.proguard:proguard-gradle:6.2.2'
         classpath('fr.avianey.androidsvgdrawable:gradle-plugin:3.1.1') {
             exclude group: 'xerces'
         }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip