From fffbf18ad94e0b5600f7b8243505797d4b935f47 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Tue, 15 Aug 2023 22:44:44 +0200 Subject: [PATCH] Update android gradle plugin --- api/build.gradle | 6 +++--- app/build.gradle | 6 +++--- appcompose/build.gradle | 6 +++--- build.gradle | 6 +++--- db/build.gradle | 6 +++--- gradle.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index c1aaf9bf..05dfdb5b 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -30,11 +30,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } lint { abortOnError false diff --git a/app/build.gradle b/app/build.gradle index e295aa7a..fadffdc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,11 +38,11 @@ android { compileOptions { coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { diff --git a/appcompose/build.gradle b/appcompose/build.gradle index 751f7402..1c4e69ec 100644 --- a/appcompose/build.gradle +++ b/appcompose/build.gradle @@ -34,12 +34,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } buildFeatures { diff --git a/build.gradle b/build.gradle index 4c674d51..15978c13 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jacoco:org.jacoco.core:0.8.7" } @@ -38,7 +38,7 @@ ext { koin_version = "3.3.3" } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } @@ -47,7 +47,7 @@ jacoco { } -task jacocoFullReport(type: JacocoReport) { +tasks.register('jacocoFullReport', JacocoReport) { group = 'Reporting' description = "Generate Jacoco coverage reports for the debug build" diff --git a/db/build.gradle b/db/build.gradle index 6eb8ff23..ed739e25 100644 --- a/db/build.gradle +++ b/db/build.gradle @@ -43,11 +43,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } lint { abortOnError false diff --git a/gradle.properties b/gradle.properties index 7363cef4..483fa846 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,9 +9,10 @@ android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m -android.databinding.incremental=true kapt.incremental.apt=true org.gradle.parallel=true android.defaults.buildfeatures.buildconfig=false +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7bd21ed8..47e2bb71 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip