From e3309252f1f18bb7dba5853ccc7eb61eef7cb0e5 Mon Sep 17 00:00:00 2001 From: Jean Date: Mon, 8 Jan 2024 20:48:48 +0100 Subject: [PATCH 1/3] upgrade gradle version to 8.2+ --- android/build.gradle | 4 ++-- android/gradle.properties | 4 +++- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b1462f87..023f7014 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -15,8 +15,8 @@ buildscript { } plugins { - id 'com.android.application' version '7.3.0' apply false - id 'com.android.library' version '7.3.0' apply false + id 'com.android.application' version '8.2.1' apply false + id 'com.android.library' version '8.2.1' apply false id 'org.jetbrains.kotlin.android' version '1.7.0' apply false } diff --git a/android/gradle.properties b/android/gradle.properties index 184b03c5..f366e6c2 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -22,4 +22,6 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true # Enable task caching -org.gradle.caching=true \ No newline at end of file +org.gradle.caching=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 4b6500ff..a05958e4 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jun 08 11:24:29 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From cc7da7466d24dc241ccc616c44cd7cbfc3d0fd00 Mon Sep 17 00:00:00 2001 From: Jean Date: Tue, 9 Jan 2024 10:53:34 +0100 Subject: [PATCH 2/3] update android CI --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1b8f6cfe..f811e5b6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of Sonar analysis From 4f40b21df718e1b1534444c78c40d3e1f7ee237f Mon Sep 17 00:00:00 2001 From: Jean Date: Tue, 9 Jan 2024 11:26:18 +0100 Subject: [PATCH 3/3] upgraded CI to use java 17 --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f811e5b6..a4907c7c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,10 +32,10 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of Sonar analysis - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: "zulu" - java-version: "11" + java-version: "17" - name: Cache Gradle uses: actions/cache@v2