Skip to content

Commit 84c5a19

Browse files
Bump to Gradle 9
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 2538de4 commit 84c5a19

4 files changed

Lines changed: 55 additions & 8 deletions

File tree

gradle.properties

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ NC_TEST_SERVER_PASSWORD=test
1111
NC_TEST_SERVER_USERNAME2=admin
1212
NC_TEST_SERVER_PASSWORD2=admin
1313
android.useAndroidX=true
14-
android.defaults.buildfeatures.buildconfig=true
14+
# android.defaults.buildfeatures.buildconfig=true
1515
android.nonTransitiveRClass=false
1616
android.nonFinalResIds=false
1717

@@ -22,3 +22,13 @@ kotlin.daemon.jvmargs=-Xmx4096m
2222
org.gradle.caching=true
2323
org.gradle.parallel=true
2424
org.gradle.configureondemand=true
25+
android.defaults.buildfeatures.resvalues=true
26+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
27+
android.enableAppCompileTimeRClass=false
28+
android.usesSdkInManifest.disallowed=false
29+
android.uniquePackageNames=false
30+
android.dependency.useConstraints=true
31+
android.r8.strictFullModeForKeepRules=false
32+
android.r8.optimizedResourceShrinking=false
33+
android.builtInKotlin=false
34+
android.newDsl=false

gradle/verification-metadata.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache"/>
5454
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
5555
<trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
56+
<trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>
5657
<trusted-key id="1D217F8475EEE9F19AB8DD6B793FD5751A0F0780" group="^com[.]squareup($|([.].*))" regex="true"/>
5758
<trusted-key id="1D2C7EF8ADA0F794B58C7C63436902AF59EDF60E">
5859
<trusting group="dev.equo.ide" name="solstice" version="1.7.5"/>
@@ -3860,6 +3861,14 @@
38603861
<sha256 value="5c4df7b2e31f17f20e4b8dbd62a2b7865a09a49a1fd2931a359fd394ecb9b5a5" origin="Generated by Gradle" reason="Artifact is not signed"/>
38613862
</artifact>
38623863
</component>
3864+
<component group="com.android.tools.build" name="bundletool" version="1.18.3">
3865+
<artifact name="bundletool-1.18.3.jar">
3866+
<sha256 value="ccad18514fd97db010856b2bbed40f481f8ba9349368c97ae54d72e3567d0171" origin="Generated by Gradle" reason="Artifact is not signed"/>
3867+
</artifact>
3868+
<artifact name="bundletool-1.18.3.pom">
3869+
<sha256 value="fa674b39b96cae98015f3850f366cfeb00fe6c7aea2d90b20c017b90e0996dae" origin="Generated by Gradle" reason="Artifact is not signed"/>
3870+
</artifact>
3871+
</component>
38633872
<component group="com.android.tools.build" name="gradle" version="8.10.1">
38643873
<artifact name="gradle-8.10.1.jar">
38653874
<sha256 value="a0fe22ce029c548335a75913f7ad517c827c567b8abb84047102034255ae1173" origin="Generated by Gradle"/>
@@ -9628,6 +9637,11 @@
96289637
<sha256 value="c01c4cda5e408f41ed1d83e4a0a170cf53801b6338aba49f0f904786bc1214fc" origin="Generated by Gradle"/>
96299638
</artifact>
96309639
</component>
9640+
<component group="commons-codec" name="commons-codec" version="1.17.1">
9641+
<artifact name="commons-codec-1.17.1.pom">
9642+
<sha256 value="7fa0db4d8150daf932958b8aea89ee24abb4d18e2316a5de535278fc131512a0" origin="Generated by Gradle"/>
9643+
</artifact>
9644+
</component>
96319645
<component group="commons-codec" name="commons-codec" version="1.2">
96329646
<artifact name="commons-codec-1.2.jar">
96339647
<sha256 value="9898a3b3857676128987b975d0b0f035becf3da5cf677266a34d6636f2b80542" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -10950,6 +10964,11 @@
1095010964
<sha256 value="675bb023c9beedde3232949979b9742a5fea946280a55a1b462d4ca7801088cd" origin="Generated by Gradle"/>
1095110965
</artifact>
1095210966
</component>
10967+
<component group="org.apache.commons" name="commons-compress" version="1.27.1">
10968+
<artifact name="commons-compress-1.27.1.pom">
10969+
<sha256 value="df8cc1a8387d4ce842363b7209fdc6d35df9763839fd3fcab558a0f83f9d841c" origin="Generated by Gradle"/>
10970+
</artifact>
10971+
</component>
1095310972
<component group="org.apache.commons" name="commons-lang3" version="3.14.0">
1095410973
<artifact name="commons-lang3-3.14.0.jar">
1095510974
<sha256 value="7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c" origin="Generated by Gradle"/>
@@ -10958,6 +10977,11 @@
1095810977
<sha256 value="110438863bad37c28f906bf87016e38c7a8c758ba321e09d11dc5a2363a8e79e" origin="Generated by Gradle"/>
1095910978
</artifact>
1096010979
</component>
10980+
<component group="org.apache.commons" name="commons-lang3" version="3.16.0">
10981+
<artifact name="commons-lang3-3.16.0.pom">
10982+
<sha256 value="e280383956c2e72c1deb3a307b3b75f05ee43649b7d43f0215f7b6c7b15eea2c" origin="Generated by Gradle"/>
10983+
</artifact>
10984+
</component>
1096110985
<component group="org.apache.commons" name="commons-lang3" version="3.17.0">
1096210986
<artifact name="commons-lang3-3.17.0.jar">
1096310987
<sha256 value="6ee731df5c8e5a2976a1ca023b6bb320ea8d3539fbe64c8a1d5cb765127c33b4" origin="Generated by Gradle"/>
@@ -11024,6 +11048,11 @@
1102411048
<sha256 value="95b7be70f316ae4ca22f6fbdd08de2182e87cd874a650de7c3d3386a747a82a3" origin="Generated by Gradle"/>
1102511049
</artifact>
1102611050
</component>
11051+
<component group="org.apache.commons" name="commons-parent" version="72">
11052+
<artifact name="commons-parent-72.pom">
11053+
<sha256 value="4345debfc767b1aeac68abdd72fc67d18b521d4b390372a11b63ff0c586b2320" origin="Generated by Gradle"/>
11054+
</artifact>
11055+
</component>
1102711056
<component group="org.apache.commons" name="commons-parent" version="73">
1102811057
<artifact name="commons-parent-73.pom">
1102911058
<sha256 value="4ed44560b07f8448479dfd1e83a422ba4e83e60b36e51b2871ac502a6d5c1bea" origin="Generated by Gradle"/>
@@ -12679,6 +12708,11 @@
1267912708
<sha256 value="5e020887aec0d89a9c168efd91aed62865553877f9303f145dbcb9d23ba60dc7" origin="Generated by Gradle"/>
1268012709
</artifact>
1268112710
</component>
12711+
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.2.10">
12712+
<artifact name="kotlin-reflect-2.2.10.pom">
12713+
<sha256 value="ae46614906414404cefc41a467435205d6dee67a2390598328a639ad2bacbd11" origin="Generated by Gradle"/>
12714+
</artifact>
12715+
</component>
1268212716
<component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.0.10">
1268312717
<artifact name="kotlin-script-runtime-2.0.10.jar">
1268412718
<sha256 value="58f4f7ad99a4a045964b44fe55f0b2604d2c5f51ff4d97c7e6817983fdf92ea7" origin="Generated by Gradle"/>

library/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
junit_version = '4.13.2'
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:8.13.2'
21+
classpath 'com.android.tools.build:gradle:9.0.0'
2222
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8'
2323
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2424
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
@@ -125,21 +125,23 @@ android {
125125

126126
buildTypes {
127127
debug {
128-
testCoverageEnabled = true
128+
enableUnitTestCoverage true
129+
enableAndroidTestCoverage true
129130
}
130131
}
131132

133+
132134
lint {
133135
abortOnError = true
134136
disable 'MissingTranslation', 'GradleDependency', 'VectorPath', 'IconMissingDensityFolder', 'IconDensities', 'GoogleAppIndexingWarning', 'MissingDefaultResource', 'StringFormatInvalid', 'MissingQuantity', 'InvalidPackage'
135137
htmlOutput = file("$project.buildDir/reports/lint/lint.html")
136138
htmlReport = true
137139
warningsAsErrors = true
140+
targetSdk 36
138141
}
139142

140143
defaultConfig {
141144
minSdkVersion 21
142-
targetSdkVersion 36
143145

144146
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
145147
testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"
@@ -163,6 +165,7 @@ android {
163165

164166
testOptions {
165167
unitTests.returnDefaultValues = true
168+
targetSdk 36
166169
}
167170

168171
packagingOptions {

sample_client/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
buildscript {
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:8.13.2'
14+
classpath 'com.android.tools.build:gradle:9.0.0'
1515
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8'
1616
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1717
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
@@ -29,9 +29,6 @@ repositories {
2929
android {
3030
compileSdk = 36
3131

32-
lintOptions {
33-
abortOnError = false
34-
}
3532

3633
packagingOptions {
3734
resources {
@@ -49,6 +46,9 @@ android {
4946
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
5047
}
5148
namespace = 'com.owncloud.android.lib.sampleclient'
49+
lint {
50+
abortOnError false
51+
}
5252
}
5353

5454
dependencies {

0 commit comments

Comments
 (0)