From d9f4e9b6ab31cdd62a05f007a965c88917c74591 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 5 Jun 2025 19:27:41 +0200 Subject: [PATCH] fix: Upgrade JDK and Gradle --- app/build.gradle | 9 ++++++--- build.gradle | 2 +- crypto/build.gradle | 6 +++--- database/build.gradle | 6 +++--- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- icon-pack/build.gradle | 6 +++--- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7b8282333..bb4c16ddb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,12 +91,15 @@ android { } compileOptions { - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" + } + buildFeatures { + buildConfig true } } diff --git a/build.gradle b/build.gradle index 80b4e9176..98d8afeaf 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/crypto/build.gradle b/crypto/build.gradle index 20634e48f..adbe03f94 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -29,12 +29,12 @@ android { } compileOptions { - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } } diff --git a/database/build.gradle b/database/build.gradle index f55d878b9..6e4d46938 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -19,12 +19,12 @@ android { } compileOptions { - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } testOptions { diff --git a/gradle.properties b/gradle.properties index b98be4dc3..1981d1516 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true kapt.incremental.apt=true org.gradle.jvmargs=-Xmx2048M diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee..48c0a02ca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/icon-pack/build.gradle b/icon-pack/build.gradle index bceaec7f5..f4ba905ab 100644 --- a/icon-pack/build.gradle +++ b/icon-pack/build.gradle @@ -11,12 +11,12 @@ android { } compileOptions { - targetCompatibility JavaVersion.VERSION_1_8 - sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } }