Skip to content

Commit a484b95

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

4 files changed

Lines changed: 9 additions & 27 deletions

File tree

app/build.gradle

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
2727
apply plugin: 'kotlinx-serialization'
2828

2929
android {
30-
compileSdkVersion 36
30+
compileSdk = 36
3131

3232
namespace = 'com.nextcloud.talk'
3333

3434
defaultConfig {
3535
manifestPlaceholders
3636
testInstrumentationRunnerArguments TEST_SERVER_URL: "$NC_TEST_SERVER_BASEURL", TEST_SERVER_USERNAME: "$NC_TEST_SERVER_USERNAME", TEST_SERVER_PASSWORD: "$NC_TEST_SERVER_PASSWORD"
37-
minSdkVersion 26
38-
targetSdkVersion 36
37+
minSdk = 26
38+
targetSdk = 36
3939
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4040

4141
// mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable)
@@ -44,8 +44,6 @@ android {
4444
versionName "23.1.0 Alpha 09"
4545

4646
flavorDimensions "default"
47-
renderscriptTargetApi = 19
48-
renderscriptSupportModeEnabled true
4947

5048
productFlavors {
5149
// used for f-droid
@@ -65,9 +63,6 @@ android {
6563
}
6664
}
6765

68-
// Enabling multidex support.
69-
multiDexEnabled = true
70-
7166
vectorDrawables.useSupportLibrary = true
7267

7368
lintOptions {
@@ -232,8 +227,6 @@ dependencies {
232227

233228
implementation 'androidx.biometric:biometric:1.1.0'
234229

235-
implementation 'androidx.multidex:multidex:2.0.1'
236-
237230
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
238231
implementation "io.reactivex.rxjava2:rxjava:2.2.21"
239232

@@ -354,8 +347,6 @@ dependencies {
354347

355348
androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
356349

357-
androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
358-
359350
androidTestImplementation(platform("androidx.compose:compose-bom:2026.03.00"))
360351
testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
361352
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"

app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package com.nextcloud.talk.application
1111

1212
import android.app.Activity
13+
import android.app.Application
1314
import android.content.Context
1415
import android.content.pm.PackageManager
1516
import android.os.Build.VERSION.SDK_INT
@@ -19,8 +20,6 @@ import androidx.appcompat.app.AppCompatDelegate
1920
import androidx.emoji2.bundled.BundledEmojiCompatConfig
2021
import androidx.emoji2.text.EmojiCompat
2122
import androidx.lifecycle.LifecycleObserver
22-
import androidx.multidex.MultiDex
23-
import androidx.multidex.MultiDexApplication
2423
import androidx.work.ExistingPeriodicWorkPolicy
2524
import androidx.work.OneTimeWorkRequest
2625
import androidx.work.PeriodicWorkRequest
@@ -89,7 +88,7 @@ import javax.inject.Singleton
8988
@Singleton
9089
@AutoInjector(NextcloudTalkApplication::class)
9190
class NextcloudTalkApplication :
92-
MultiDexApplication(),
91+
Application(),
9392
LifecycleObserver {
9493
//region Fields (components)
9594
lateinit var componentApplication: NextcloudTalkApplicationComponent
@@ -217,11 +216,6 @@ class NextcloudTalkApplication :
217216
.build()
218217
}
219218

220-
override fun attachBaseContext(base: Context) {
221-
super.attachBaseContext(base)
222-
MultiDex.install(this)
223-
}
224-
225219
private fun buildDefaultImageLoader(): ImageLoader {
226220
val imageLoaderBuilder = ImageLoader.Builder(applicationContext)
227221
.memoryCache {

gradle.properties

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
44
# SPDX-FileCopyrightText: 2024-2025 Marcel Hibbe <dev@mhibbe.de>
5-
# SPDX-FileCopyrightText: 2021 Tim Krüger <t@timkrueger.me>
5+
# SPDX-FileCopyrightText: 2021 Tim Krueger <t@timkrueger.me>
66
# SPDX-FileCopyrightText: 2017-2019 Mario Danic <mario@lovelyhq.com>
77
# SPDX-License-Identifier: GPL-3.0-or-later
88

@@ -26,15 +26,11 @@ 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
3329
android.uniquePackageNames=false
3430
android.dependency.useConstraints=true
3531
android.r8.strictFullModeForKeepRules=false
36-
android.r8.optimizedResourceShrinking=false
37-
android.builtInKotlin=false
32+
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
33+
# TODO: remove once spotbugs-gradle-plugin supports AGP new DSL (blocked until AGP 10.0)
3834
android.newDsl=false
3935

4036
# Needed for local libs

gradle/verification-metadata.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<trusting group="androidx.databinding"/>
4444
<trusting group="androidx.datastore"/>
4545
<trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
46+
<trusting group="^com[.]android($|([.].*))" regex="true"/>
4647
</trusted-key>
4748
<trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42">
4849
<trusting group="androidx.activity"/>

0 commit comments

Comments
 (0)