From 339750e97cdaf07ed7be301063b542e2448bfd51 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Fri, 14 Apr 2023 20:56:29 +0200 Subject: [PATCH] Update AGP to 8.0.0 --- .../card_locker/LoyaltyCardCursorAdapter.java | 4 ++-- .../card_locker/LoyaltyCardEditActivity.java | 14 ++++++-------- .../java/protect/card_locker/ScanActivity.java | 3 +-- .../java/protect/card_locker/UCropWrapper.java | 4 ++-- app/src/main/java/protect/card_locker/Utils.java | 4 +--- build.gradle | 2 +- build.sh | 10 +++++----- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java index b95f1c2eb..eb520f438 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java @@ -141,7 +141,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter { navigateToSystemPermissionSetting(); } : null); - customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(R.attr.colorSurface) : Color.TRANSPARENT); + customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT); customBarcodeScannerBinding.cameraPermissionDeniedLayout.getRoot().setVisibility(show ? View.VISIBLE : View.GONE); } diff --git a/app/src/main/java/protect/card_locker/UCropWrapper.java b/app/src/main/java/protect/card_locker/UCropWrapper.java index 3c5fea3a5..4363ae2b2 100644 --- a/app/src/main/java/protect/card_locker/UCropWrapper.java +++ b/app/src/main/java/protect/card_locker/UCropWrapper.java @@ -53,8 +53,8 @@ public class UCropWrapper extends UCropActivity { AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check; // everything gathered and are as expected, now perform color patching Utils.patchColors(this); - int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface)); - int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface)); + int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface)); + int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface)); Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground(); controlsBackgroundImageDrawable.mutate(); diff --git a/app/src/main/java/protect/card_locker/Utils.java b/app/src/main/java/protect/card_locker/Utils.java index 160b0f874..e443e6835 100644 --- a/app/src/main/java/protect/card_locker/Utils.java +++ b/app/src/main/java/protect/card_locker/Utils.java @@ -15,7 +15,6 @@ import android.net.Uri; import android.os.Build; import android.os.LocaleList; import android.provider.MediaStore; -import android.text.format.DateUtils; import android.util.Log; import android.util.TypedValue; import android.view.MenuItem; @@ -46,7 +45,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.StringWriter; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.text.NumberFormat; @@ -574,7 +572,7 @@ public class Utils { return fallback; } - return new Palette.Builder(image).generate().getDominantColor(R.attr.colorPrimary); + return new Palette.Builder(image).generate().getDominantColor(androidx.appcompat.R.attr.colorPrimary); } public static int getRandomHeaderColor(Context context) { diff --git a/build.gradle b/build.gradle index 32ba76dd3..9e6474b15 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.4.2' apply false + id 'com.android.application' version '8.0.0' apply false id 'com.github.spotbugs' version "5.0.14" apply false } diff --git a/build.sh b/build.sh index c2a9e8967..e6401352e 100755 --- a/build.sh +++ b/build.sh @@ -11,13 +11,13 @@ if [ -z "${ANDROID_SDK_ROOT:-}" ]; then fi if [ -z "${JAVA_HOME:-}" ]; then - echo "JAVA_HOME is not set, setting to Java 11 (like F-Droid)" + echo "JAVA_HOME is not set, setting to Java 17" if [ -f "/etc/debian_version" ]; then - echo "Debian-based distro, Java 11 is /usr/lib/jvm/java-11-openjdk-amd64" - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 + echo "Debian-based distro, Java 17 is /usr/lib/jvm/java-17-openjdk-amd64" + export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 else - echo "Not Debian-based, assuming Fedora and setting Java 11 as /usr/lib/jvm/java-11-openjdk" - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk + echo "Not Debian-based, assuming Fedora and setting Java 17 as /usr/lib/jvm/java-17-openjdk" + export JAVA_HOME=/usr/lib/jvm/java-17-openjdk fi fi diff --git a/gradle.properties b/gradle.properties index 210ead18e..7a211799e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=true +android.nonTransitiveRClass=true android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b0f14283..52e4243ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jul 25 20:59:51 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME