Skip to content

Commit cec5847

Browse files
build(AGP): Bump to v9.0.0
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 4909240 commit cec5847

8 files changed

Lines changed: 853 additions & 19 deletions

File tree

.idea/codeStyles/Project.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ buildscript {
2121
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2222
plugins {
2323
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0' apply false
24-
id 'com.android.library' version '8.13.2' apply false
24+
id 'com.android.library' version '9.0.0' apply false
2525
id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
26-
id "org.jetbrains.kotlin.kapt" version "$kotlinVersion" apply false
26+
id "com.android.legacy-kapt" version '9.0.0' apply false
2727
id "com.diffplug.spotless" version "8.1.0" apply false
2828
id 'io.gitlab.arturbosch.detekt' version '1.23.8' apply false
29-
id 'com.android.application' version '8.13.2' apply false
29+
id 'com.android.application' version '9.0.0' apply false
3030
}
3131

3232
tasks.register('clean', Delete) {

core/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77

88
plugins {
99
id 'com.android.library'
10-
id 'org.jetbrains.kotlin.android'
1110
id 'maven-publish'
1211
}
1312

1413
android {
1514
defaultConfig {
1615
minSdk = 21
1716
compileSdk = 36
18-
targetSdk = 36
1917

2018
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2119
}
@@ -24,22 +22,23 @@ android {
2422
unitTests {
2523
includeAndroidResources = true
2624
}
25+
targetSdk 36
2726
}
2827

2928
compileOptions {
3029
sourceCompatibility JavaVersion.VERSION_17
3130
targetCompatibility JavaVersion.VERSION_17
3231
}
33-
kotlinOptions {
34-
jvmTarget = '17'
35-
}
3632
namespace 'com.nextcloud.android.common.core'
3733

3834
publishing {
3935
singleVariant('release') {
4036
withSourcesJar()
4137
}
4238
}
39+
lint {
40+
targetSdk 36
41+
}
4342
}
4443

4544
dependencies {

gradle.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ kotlin.code.style=official
99
# thereby reducing the size of the R class for that library
1010
android.nonTransitiveRClass=true
1111
android.nonFinalResIds=false
12+
android.defaults.buildfeatures.resvalues=true
13+
android.enableAppCompileTimeRClass=false
14+
android.uniquePackageNames=false
15+
android.dependency.useConstraints=true
16+
android.r8.strictFullModeForKeepRules=false
17+
android.newDsl=false

gradle/verification-metadata.xml

Lines changed: 824 additions & 0 deletions
Large diffs are not rendered by default.

sample/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
plugins {
99
id 'com.android.application'
10-
id 'org.jetbrains.kotlin.android'
1110
}
1211

1312
android {
@@ -17,7 +16,6 @@ android {
1716
applicationId "com.nextcloud.android.common.sample"
1817
minSdk = 26
1918
compileSdk = 36
20-
targetSdk = 36
2119
versionCode 1
2220
versionName "1.0"
2321

@@ -34,9 +32,7 @@ android {
3432
sourceCompatibility JavaVersion.VERSION_17
3533
targetCompatibility JavaVersion.VERSION_17
3634
}
37-
kotlinOptions {
38-
jvmTarget = '17'
39-
}
35+
4036
buildFeatures {
4137
viewBinding true
4238
}

ui/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
plugins {
99
id 'org.jetbrains.kotlin.plugin.compose'
1010
id 'com.android.library'
11-
id 'org.jetbrains.kotlin.android'
12-
id 'org.jetbrains.kotlin.kapt'
11+
id 'com.android.built-in-kotlin'
12+
id 'com.android.legacy-kapt'
1313
id 'maven-publish'
1414
}
1515

1616
android {
1717
defaultConfig {
1818
minSdk = 21
1919
compileSdk = 36
20-
targetSdk = 36
2120

2221
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2322
}
@@ -30,16 +29,19 @@ android {
3029
sourceCompatibility JavaVersion.VERSION_17
3130
targetCompatibility JavaVersion.VERSION_17
3231
}
33-
kotlinOptions {
34-
jvmTarget = '17'
35-
}
3632
namespace 'com.nextcloud.android.common.ui'
3733

3834
publishing {
3935
singleVariant('release') {
4036
withSourcesJar()
4137
}
4238
}
39+
lint {
40+
targetSdk 36
41+
}
42+
testOptions {
43+
targetSdk 36
44+
}
4345
}
4446

4547
dependencies {

0 commit comments

Comments
 (0)