Bump to AGP and Gradle 8.x

Disable new R8 mode and resource namespacing for now to avoid build failures.
These needs to be worked on before they can be enabled.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta 2023-08-03 00:41:27 +08:00
parent 4a31035585
commit 6ca1f2792f
8 changed files with 25 additions and 13 deletions

View file

@ -29,7 +29,7 @@ jobs:
- name: Set up JDK 11 - name: Set up JDK 11
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 17
- name: Build - name: Build
run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck run: ./gradlew compileDebugAndroidTestSources check assemble ktlintCheck

View file

@ -31,7 +31,7 @@ android {
} }
} }
lintOptions { lint {
disable "DialogFragmentCallbacksDetector", disable "DialogFragmentCallbacksDetector",
"InvalidFragmentVersionForActivityResult", "InvalidFragmentVersionForActivityResult",
"CheckedExceptions" "CheckedExceptions"

View file

@ -10,9 +10,9 @@ buildscript {
} }
plugins { plugins {
id 'com.android.application' version '7.4.2' apply false id 'com.android.application' version '8.1.0' apply false
id 'com.android.library' version '7.4.2' apply false id 'com.android.library' version '8.1.0' apply false
id 'com.google.protobuf' version '0.8.17' apply false id 'com.google.protobuf' version '0.9.4' apply false
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
id 'org.jetbrains.kotlin.kapt' version "$kotlin_version" apply false id 'org.jetbrains.kotlin.kapt' version "$kotlin_version" apply false
id 'org.jetbrains.dokka' version "$kotlin_version" apply false id 'org.jetbrains.dokka' version "$kotlin_version" apply false

View file

@ -3,3 +3,5 @@ org.gradle.configureondemand=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false
kotlin.code.style=official kotlin.code.style=official
android.nonTransitiveRClass=false
android.enableR8.fullMode=false

View file

@ -1,7 +1,7 @@
#Fri Aug 19 10:56:09 IST 2022 #Fri Aug 19 10:56:09 IST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2 distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1

View file

@ -39,15 +39,22 @@ android {
jvmTarget = JavaVersion.VERSION_11.toString() jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
} }
lintOptions { lint {
disable "DialogFragmentCallbacksDetector", disable "DialogFragmentCallbacksDetector",
"InvalidFragmentVersionForActivityResult" "InvalidFragmentVersionForActivityResult"
} }
packagingOptions { packagingOptions {
exclude 'META-INF/*.kotlin_module' jniLibs {
exclude 'META-INF/androidx.*.version' excludes += ['META-INF/services/kotlin*']
exclude 'META-INF/services/kotlin*' }
exclude 'kotlin/internal/internal.kotlin_builtins' resources {
excludes += [
'META-INF/*.kotlin_module',
'META-INF/androidx.*.version',
'META-INF/services/kotlin*',
'kotlin/internal/internal.kotlin_builtins'
]
}
} }
} }

View file

@ -62,7 +62,7 @@ android {
} }
} }
} }
lintOptions { lint {
disable "DialogFragmentCallbacksDetector", disable "DialogFragmentCallbacksDetector",
"InvalidFragmentVersionForActivityResult", "InvalidFragmentVersionForActivityResult",
"CheckedExceptions" "CheckedExceptions"

View file

@ -24,3 +24,6 @@
#-renamesourcefileattribute SourceFile #-renamesourcefileattribute SourceFile
-keep class org.calyxos.backup.storage.** {*;} -keep class org.calyxos.backup.storage.** {*;}
# Ignore StringConcatFactory
-dontwarn java.lang.invoke.StringConcatFactory