Skip to content

Commit 8271c04

Browse files
AndyScherzingerAndyScherzinger
committed
chore: Update to AGP9.1
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent fe7ffeb commit 8271c04

4 files changed

Lines changed: 92 additions & 15 deletions

File tree

‎app/build.gradle‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ import com.github.spotbugs.snom.SpotBugsTask
1414

1515
plugins {
1616
id "org.jetbrains.kotlin.plugin.compose" version "2.3.10"
17-
id "org.jetbrains.kotlin.kapt"
17+
id 'com.android.built-in-kotlin'
18+
id "com.android.legacy-kapt"
1819
id 'com.google.devtools.ksp' version '2.3.6'
1920
}
2021

2122
apply plugin: 'com.android.application'
22-
apply plugin: 'kotlin-android'
23-
apply plugin: 'kotlin-kapt'
2423
apply plugin: 'kotlin-parcelize'
2524
apply plugin: 'com.github.spotbugs'
2625
apply plugin: 'io.gitlab.arturbosch.detekt'
@@ -33,6 +32,8 @@ android {
3332
namespace = 'com.nextcloud.talk'
3433

3534
defaultConfig {
35+
manifestPlaceholders
36+
testInstrumentationRunnerArguments TEST_SERVER_URL: "$NC_TEST_SERVER_BASEURL", TEST_SERVER_USERNAME: "$NC_TEST_SERVER_USERNAME", TEST_SERVER_PASSWORD: "$NC_TEST_SERVER_PASSWORD"
3637
minSdkVersion 26
3738
targetSdkVersion 36
3839
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -87,10 +88,6 @@ android {
8788
getByName("androidTest").assets.srcDir("$projectDir/schemas")
8889
}
8990

90-
testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"
91-
testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}"
92-
testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}"
93-
9491
def localBroadcastPermission = "PRIVATE_BROADCAST"
9592
manifestPlaceholders.broadcastPermission = localBroadcastPermission
9693
buildConfigField "String", "PERMISSION_LOCAL_BROADCAST", "\"${localBroadcastPermission}\""
@@ -106,7 +103,7 @@ android {
106103
buildTypes {
107104
release {
108105
minifyEnabled false
109-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
106+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
110107
}
111108
}
112109

@@ -130,10 +127,6 @@ android {
130127
targetCompatibility JavaVersion.VERSION_17
131128
}
132129

133-
kotlinOptions {
134-
jvmTarget = '17'
135-
}
136-
137130
buildFeatures {
138131
viewBinding = true
139132
buildConfig = true
@@ -149,6 +142,7 @@ android {
149142
disable 'MissingTranslation','PrivateResource'
150143
htmlOutput = layout.buildDirectory.file("reports/lint/lint.html").get().asFile
151144
htmlReport = true
145+
targetSdk 36
152146
}
153147
}
154148
kapt {
@@ -261,6 +255,7 @@ dependencies {
261255
implementation 'com.github.lukaspili.autodagger2:autodagger2:1.1'
262256
kapt 'com.github.lukaspili.autodagger2:autodagger2-compiler:1.1'
263257
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
258+
kapt 'javax.annotation:javax.annotation-api:1.3.2'
264259

265260
implementation 'org.greenrobot:eventbus:3.3.1'
266261
implementation 'net.zetetic:sqlcipher-android:4.13.0'
@@ -423,4 +418,4 @@ detekt {
423418

424419
ksp {
425420
arg('room.schemaLocation', "$projectDir/schemas")
426-
}
421+
}

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ buildscript {
2121
}
2222

2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:8.13.2'
24+
classpath 'com.android.tools.build:gradle:9.1.0'
2525
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
2626
classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}"
27+
classpath "com.android.legacy-kapt:com.android.legacy-kapt.gradle.plugin:9.1.0"
2728
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8'
2829
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
2930
classpath "org.jlleitschuh.gradle:ktlint-gradle:14.2.0"

‎gradle.properties‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ org.gradle.configureondemand=true
2626
kapt.incremental.apt=true
2727
org.gradle.daemon=true
2828
org.gradle.configuration-cache=true
29+
android.defaults.buildfeatures.resvalues=true
30+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
31+
android.enableAppCompileTimeRClass=false
32+
android.usesSdkInManifest.disallowed=false
33+
android.uniquePackageNames=false
34+
android.dependency.useConstraints=true
35+
android.r8.strictFullModeForKeepRules=false
36+
android.r8.optimizedResourceShrinking=false
37+
android.builtInKotlin=false
38+
android.newDsl=false
2939

3040
# Needed for local libs
3141
# org.gradle.dependency.verification=lenient

‎gradle/verification-metadata.xml‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<trust file=".*-javadoc[.]jar" regex="true" reason="Android Studio downloads javadoc jars but doesn't add checksums - fixes building in AS"/>
1515
<trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
1616
</trusted-artifacts>
17+
<ignored-keys>
18+
<ignored-key id="5A68A2249128E2C6" reason="Key couldn't be downloaded from any key server"/>
19+
</ignored-keys>
1720
<trusted-keys>
1821
<trusted-key id="02A36B6DB7056EB5E6FFEF893DA731F041734930" group="org.parceler"/>
1922
<trusted-key id="03C123038C20AAE9E286C857479D601F3A7B5C1A" group="com.github.ajalt.clikt"/>
@@ -37,6 +40,7 @@
3740
<trusted-key id="0E225917414670F4442C250DFD533C07C264648F">
3841
<trusting group="androidx.activity"/>
3942
<trusting group="androidx.core"/>
43+
<trusting group="androidx.databinding"/>
4044
<trusting group="androidx.datastore"/>
4145
<trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
4246
</trusted-key>
@@ -283,7 +287,10 @@
283287
<trusted-key id="95115197C5227C0887299D000F9FE62F88E938D8" group="com.google.dagger"/>
284288
<trusted-key id="9857C388D7D1D9D031274CD0A5DEF5A76F94A471" group="^com[.]github[.]spotbugs($|([.].*))" regex="true"/>
285289
<trusted-key id="A33A0B49A4C1AB590B0A4DDC1364C5E2DF3E99C5" group="org.reactivestreams" name="reactive-streams" version="1.0.3"/>
286-
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="com.google.code.findbugs" name="jsr305" version="2.0.2"/>
290+
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA">
291+
<trusting group="com.google.code.findbugs" name="jsr305" version="2.0.2"/>
292+
<trusting group="org.jacoco"/>
293+
</trusted-key>
287294
<trusted-key id="A42FEF087AF29AE864684EAEE6039456D5BBD4F8" group="io.fabric8" name="kubernetes-client-bom" version="5.12.4"/>
288295
<trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
289296
<trusted-key id="A5F483CD733A4EBAEA378B2AE88979FB9B30ACF2">
@@ -12762,6 +12769,14 @@
1276212769
<sha256 value="5c4df7b2e31f17f20e4b8dbd62a2b7865a09a49a1fd2931a359fd394ecb9b5a5" origin="Generated by Gradle" reason="Artifact is not signed"/>
1276312770
</artifact>
1276412771
</component>
12772+
<component group="com.android.tools.build" name="bundletool" version="1.18.3">
12773+
<artifact name="bundletool-1.18.3.jar">
12774+
<sha256 value="ccad18514fd97db010856b2bbed40f481f8ba9349368c97ae54d72e3567d0171" origin="Generated by Gradle" reason="Artifact is not signed"/>
12775+
</artifact>
12776+
<artifact name="bundletool-1.18.3.pom">
12777+
<sha256 value="fa674b39b96cae98015f3850f366cfeb00fe6c7aea2d90b20c017b90e0996dae" origin="Generated by Gradle" reason="Artifact is not signed"/>
12778+
</artifact>
12779+
</component>
1276512780
<component group="com.android.tools.build" name="gradle" version="8.10.0">
1276612781
<artifact name="gradle-8.10.0.jar">
1276712782
<sha256 value="637b7a7ecb20533b6d2d5401bed07e20549eb700019c6257f137eca73a0cb419" origin="Generated by Gradle"/>
@@ -18779,6 +18794,14 @@
1877918794
<sha256 value="af781c9a5766ffea311a0df0536576a64decc661aa110c4de5c73ac8bf434424" origin="Generated by Gradle"/>
1878018795
</artifact>
1878118796
</component>
18797+
<component group="com.google.crypto.tink" name="tink" version="1.18.0">
18798+
<artifact name="tink-1.18.0.jar">
18799+
<sha256 value="30df12a1f59045637213477656e01f6fbcc02616c20da1696cbd4643ada668ef" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
18800+
</artifact>
18801+
<artifact name="tink-1.18.0.pom">
18802+
<sha256 value="08c2dcac9ce37428aca73b1d6aa6a93f35c385224db03b3cae843b74e64d1edf" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
18803+
</artifact>
18804+
</component>
1878218805
<component group="com.google.crypto.tink" name="tink" version="1.7.0">
1878318806
<artifact name="tink-1.7.0.jar">
1878418807
<sha256 value="88970a456a08ba4c66b01b23e5846ca1095cc14e54cb48363e5d2e15a1307308" origin="Generated by Gradle"/>
@@ -20409,6 +20432,14 @@
2040920432
<sha256 value="913b3aee95a71581a409038b1cca273ce835d3f2b8f2ab5a600bbed769ea6dfd" origin="Generated by Gradle" reason="Artifact is not signed"/>
2041020433
</artifact>
2041120434
</component>
20435+
<component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.9-alpha04">
20436+
<artifact name="android-device-provider-local-0.0.9-alpha04.jar">
20437+
<sha256 value="07442dc00e29d3f1b888e8e1d02786184fc348dfbdf04040625e25a4af937d77" origin="Generated by Gradle" reason="Artifact is not signed"/>
20438+
</artifact>
20439+
<artifact name="android-device-provider-local-0.0.9-alpha04.pom">
20440+
<sha256 value="00c8e427d5caa8efd8daca2647b2213cb402b9d39275a3a82d88977f270ff713" origin="Generated by Gradle" reason="Artifact is not signed"/>
20441+
</artifact>
20442+
</component>
2041220443
<component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.8-alpha08">
2041320444
<artifact name="android-driver-instrumentation-0.0.8-alpha08.jar">
2041420445
<sha256 value="c4436abe8b83e5fc7341b2314fd6b327feb8a7b64c294f8b9d08b8b3be214afc" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20433,6 +20464,14 @@
2043320464
<sha256 value="02d5c14ad0995971a108819075a7175d10076bd7152772ced3442bb19c4c1b53" origin="Generated by Gradle" reason="Artifact is not signed"/>
2043420465
</artifact>
2043520466
</component>
20467+
<component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.9-alpha04">
20468+
<artifact name="android-driver-instrumentation-0.0.9-alpha04.jar">
20469+
<sha256 value="ce98aea320c84ac870c3c437c20154c9b438b65d4b188f3006cfbd99540b8b35" origin="Generated by Gradle" reason="Artifact is not signed"/>
20470+
</artifact>
20471+
<artifact name="android-driver-instrumentation-0.0.9-alpha04.pom">
20472+
<sha256 value="0e3eefae7ec14a100fede68fb586b16b3990d53a68ace4ef3fefbca66c2bb835" origin="Generated by Gradle" reason="Artifact is not signed"/>
20473+
</artifact>
20474+
</component>
2043620475
<component group="com.google.testing.platform" name="android-test-plugin" version="0.0.8-alpha08">
2043720476
<artifact name="android-test-plugin-0.0.8-alpha08.jar">
2043820477
<sha256 value="27a7ca80d78e568f29e2e59487202d1918e7ba26ff511c756e35e8746baa6e93" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20457,6 +20496,14 @@
2045720496
<sha256 value="a82b9c10caaa8e5d1f3cdb63847a9b03ac9738a525b309ab70d4d1661edfea22" origin="Generated by Gradle" reason="Artifact is not signed"/>
2045820497
</artifact>
2045920498
</component>
20499+
<component group="com.google.testing.platform" name="android-test-plugin" version="0.0.9-alpha04">
20500+
<artifact name="android-test-plugin-0.0.9-alpha04.jar">
20501+
<sha256 value="ad63f94ffc0a497b41aeac656fc240d0143927033b8ff2da077b85bcbf7ef37f" origin="Generated by Gradle" reason="Artifact is not signed"/>
20502+
</artifact>
20503+
<artifact name="android-test-plugin-0.0.9-alpha04.pom">
20504+
<sha256 value="28563d695baea3c45363c8792b9954f7e7c173cda489848fb52a919e90df9576" origin="Generated by Gradle" reason="Artifact is not signed"/>
20505+
</artifact>
20506+
</component>
2046020507
<component group="com.google.testing.platform" name="core" version="0.0.8-alpha08">
2046120508
<artifact name="core-0.0.8-alpha08.jar">
2046220509
<sha256 value="88f278028d24b154435dd8563dff4c618bb737b6539d277e46327d898243e722" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20481,6 +20528,14 @@
2048120528
<sha256 value="9f03da959b3261cc1eb9c8886bf8aed6f5d60bb95b8d8638bed55443ae620c2a" origin="Generated by Gradle" reason="Artifact is not signed"/>
2048220529
</artifact>
2048320530
</component>
20531+
<component group="com.google.testing.platform" name="core" version="0.0.9-alpha04">
20532+
<artifact name="core-0.0.9-alpha04.jar">
20533+
<sha256 value="d8c6ceb0a5dec0593dbe56d94f0d0451fc14698a89d732c276908bb4748377fe" origin="Generated by Gradle" reason="Artifact is not signed"/>
20534+
</artifact>
20535+
<artifact name="core-0.0.9-alpha04.pom">
20536+
<sha256 value="a7b6ed15167c7a3c26deca562f76ee99aedb2b8fd35ca6f32c5a9bfb843f69b1" origin="Generated by Gradle" reason="Artifact is not signed"/>
20537+
</artifact>
20538+
</component>
2048420539
<component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha08">
2048520540
<artifact name="core-proto-0.0.8-alpha08.jar">
2048620541
<sha256 value="3920575a74f1437975cdf45276f9b75e7ae41bafb8deb1d60e7d639f21d1b06c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20505,6 +20560,14 @@
2050520560
<sha256 value="3bb45280df1dd1c96b9a01724a614566b7d60d33453fcd52c2c741f9999c3a4e" origin="Generated by Gradle" reason="Artifact is not signed"/>
2050620561
</artifact>
2050720562
</component>
20563+
<component group="com.google.testing.platform" name="core-proto" version="0.0.9-alpha04">
20564+
<artifact name="core-proto-0.0.9-alpha04.jar">
20565+
<sha256 value="f1abe1b26373cb8623c06a229f858b45af17c2ffb680b04fb0beefed6979c087" origin="Generated by Gradle" reason="Artifact is not signed"/>
20566+
</artifact>
20567+
<artifact name="core-proto-0.0.9-alpha04.pom">
20568+
<sha256 value="6228d96b554334f904c456f19bd6088d4ec62380f41066dc3f56db039dbdc2f0" origin="Generated by Gradle" reason="Artifact is not signed"/>
20569+
</artifact>
20570+
</component>
2050820571
<component group="com.google.testing.platform" name="launcher" version="0.0.8-alpha08">
2050920572
<artifact name="launcher-0.0.8-alpha08.jar">
2051020573
<sha256 value="b12982e7c34c56e480b18d49f1405a8965a9b79823c3805a488c5bc642e579d9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20529,6 +20592,14 @@
2052920592
<sha256 value="18b80f34a5e9fa1a5eec2250fd71e5465f2eb4b4d09e181940e38f1b6e064452" origin="Generated by Gradle" reason="Artifact is not signed"/>
2053020593
</artifact>
2053120594
</component>
20595+
<component group="com.google.testing.platform" name="launcher" version="0.0.9-alpha04">
20596+
<artifact name="launcher-0.0.9-alpha04.jar">
20597+
<sha256 value="fb26d0f83c6d95cd7009b885bc443079060e99cc4d9bd5140429a217bf043c2e" origin="Generated by Gradle" reason="Artifact is not signed"/>
20598+
</artifact>
20599+
<artifact name="launcher-0.0.9-alpha04.pom">
20600+
<sha256 value="5cbc029be3c3cb9cf757a5979f0d1845dd561826601e3f69f83bd8e0b139280c" origin="Generated by Gradle" reason="Artifact is not signed"/>
20601+
</artifact>
20602+
</component>
2053220603
<component group="com.google.testparameterinjector" name="test-parameter-injector" version="1.18">
2053320604
<artifact name="test-parameter-injector-1.18.jar">
2053420605
<sha256 value="e5a7c649c54c412049908247ca5e25fe6921d746849c6017a84dc6044237a4b4" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)