Skip to content

Commit 182ee4c

Browse files
committed
build: Adapt to AGP 9.0 and update build configuration
1 parent 571421f commit 182ee4c

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

app/build.gradle.kts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
androidResources {
3838
additionalParameters += arrayOf("--allow-reserved-package-id", "--package-id", "0x4b")
3939
}
40-
packagingOptions.resources {
40+
packaging.resources {
4141
excludes.addAll(
4242
arrayOf(
4343
"META-INF/**", "**.bin"
@@ -63,7 +63,7 @@ android {
6363
buildTypes {
6464
release {
6565
isMinifyEnabled = true
66-
isShrinkResources = true
66+
isShrinkResources = false
6767
proguardFiles(
6868
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
6969
)
@@ -78,16 +78,6 @@ android {
7878
sourceCompatibility = JavaVersion.VERSION_17
7979
targetCompatibility = JavaVersion.VERSION_17
8080
}
81-
kotlin {
82-
compilerOptions {
83-
freeCompilerArgs.addAll(
84-
"-Xno-param-assertions",
85-
"-Xno-receiver-assertions",
86-
"-Xno-call-assertions"
87-
)
88-
jvmTarget = JvmTarget.JVM_17
89-
}
90-
}
9181
sourceSets {
9282
getByName("main") {
9383
java {
@@ -101,7 +91,16 @@ android {
10191
}
10292
}
10393
}
104-
94+
kotlin {
95+
compilerOptions {
96+
freeCompilerArgs.addAll(
97+
"-Xno-param-assertions",
98+
"-Xno-receiver-assertions",
99+
"-Xno-call-assertions"
100+
)
101+
jvmTarget = JvmTarget.JVM_17
102+
}
103+
}
105104
tasks.withType<Test> {
106105
useJUnitPlatform()
107106
}

app/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# public *;
1414
#}
1515

16-
-keep class io.github.chsbuffer.revancedxposed.MainHook
16+
-keep class io.github.chsbuffer.revancedxposed.MainHook { <init>(); }
1717
-keepclassmembers class **.* {
1818
public <init>(android.content.Context, android.util.AttributeSet);
1919
}

gradle.properties

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ android.enableJetifier=false
2626
# resources declared in the library itself and none from the library's dependencies,
2727
# thereby reducing the size of the R class for that library
2828
android.nonTransitiveRClass=true
29-
#
30-
android.enableNewResourceShrinker.preciseShrinking=true
31-
android.enableAppCompileTimeRClass=true
29+
# AGP 9.0 new behaviors
30+
android.newDsl=true
31+
android.enableAppCompileTimeRClass=true
32+
android.r8.optimizedResourceShrinking=true
33+
android.r8.strictFullModeForKeepRules=true
34+
android.proguard.failOnMissingFiles=true
35+
android.onlyEnableUnitTestForTheTestedBuildType=true
36+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=true
37+
# AGP 9.0 new behaviors opt-out
38+
android.builtInKotlin=false

settings.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ dependencyResolutionManagement {
2424
}
2525
}
2626

27-
2827
plugins {
29-
id("com.android.settings") version("8.10.0")
28+
id("com.android.settings") version ("8.13.0")
3029
}
3130

3231
android {
3332
compileSdk = 36
34-
targetSdk = 36
3533
minSdk = 27
3634
}
3735

0 commit comments

Comments
 (0)