Skip to content

Commit f14f5f9

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

5 files changed

Lines changed: 148 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-keyring.keys

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,34 @@ xxhY1RITnc2C33wjXAW0h+qq7/7Yq3w3/7ncv9sWIzU=
12481248
=3nku
12491249
-----END PGP PUBLIC KEY BLOCK-----
12501250

1251+
pub BF984B4145EA13F7
1252+
uid Egor Andreevici <egor@squareup.com>
1253+
1254+
sub 84761D363E7B0FC4
1255+
-----BEGIN PGP PUBLIC KEY BLOCK-----
1256+
1257+
xsBNBF7rgogBCADU9OwoEFdIgN5U0JU5pI7s3T1T1LeDMzAQ8l2Hq4jFrhnrjcEA
1258+
ieDSut1YIv5NTBoZv4CrklaKvvQNUXPvKrFImA4OKhBodKV3wsq2efCATDGa1JAw
1259+
VEJx6nJxxMsCLCJvmZsD+YE8/DIBI6jjnjh8jagZVkxkSRPvUIxlZCxytIyqXI0t
1260+
O8pLh8+8p5e0PgGb9OoszxEQZdBavsixdpe+0feU9cz0l0jJYx3W4ErZeCGGwNat
1261+
UUiW0ctb3iz7BkNhhoV9zepxkSLzCf5zBeyA+WfD34028pAfPpyAfDYXF4x55sVP
1262+
/3MdWGB6eU6KzPG2/QV/6or5E+C1yCMrnMy1ABEBAAG0I0Vnb3IgQW5kcmVldmlj
1263+
aSA8ZWdvckBzcXVhcmV1cC5jb20+zsBNBF7rgogBCADBMYkuALuhT0pTMowmk/BH
1264+
8T9OXsu/a2EkmXf4sZqslcyZF2G3/0iQgXl/fjbVlNyxLi9C/Vl4AAPWLNfDWicw
1265+
TAuJIkCX8lyuimpO7FH2Vlr8dwHdyLd+V+LLyTbkfRqKoLDrwg9Uj4CuzH03ABfH
1266+
uI9lFKoEZ4zOUunUWugB9rN2wo/BhPmEh/QINqLDXCgYKLDYr8NOLWIfrI8fFuXo
1267+
SmjhDKwQzvDjGFXoiBDrwSI7AmaSYAJzgT4f+8yEO9rT2vTrt5wFgcHYjwYKr+RU
1268+
yFZh1jHwCSkUQluK4toTeraBxq4yTIKG7cFuer04m2/NhBi3WNwReNQ0E9jBIjNV
1269+
ABEBAAHCwHwEGAEIACYWIQQdCoted8Z4p8ckRFq/mEtBReoT9wUCXuuCiAIbDAUJ
1270+
A8JnAAAKCRC/mEtBReoT91VqB/9VIYofkP4iSHXbwWrVnc6YDntN6aSvaQlmdinq
1271+
bpCC20fG6V93KlIk2xQ91vsm662NJODnvYV3Jt63tDdhgHxFn7UZJ8Vx9EzHslqA
1272+
ZZXX0jOQ465YzPPFwCJJP09sHAEb9TwufSCGRijqYsSLReT6bGCCOGM5a4qVPfLF
1273+
wU0pSS1Nf1GWk+1zTmfTtfz1cQA6VSHh+jFXVoeFuwFf3WGeY3d9TW1w07cgyQVG
1274+
KIqtobtdPkTaKqtvFpiUBg/GqiLijqXgQPBIqy3EaAxhC0qmE5UMgvJ5fD+T4JBG
1275+
eQh3BspmZac4oUdxAqzyU5N/Um+w90sQluFqwoVd5FX5i4L3
1276+
=ciUG
1277+
-----END PGP PUBLIC KEY BLOCK-----
1278+
12511279
pub C3BAB45F4AF71FAB
12521280
uid Yang Song <songya@google.com>
12531281

@@ -2699,6 +2727,31 @@ fVJykhD1P8/4BedOSN7DqsnvIUfFaQ==
26992727
=iddT
27002728
-----END PGP PUBLIC KEY BLOCK-----
27012729

2730+
pub 07D3516820BCF6B1
2731+
sub 11F4CE313A637CC1
2732+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2733+
2734+
xsBNBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
2735+
sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
2736+
sHPwo1aRXdI0MvCy+7iaIiiGF4/O16AhU4LmALHnaRQZCyuN6VOQ8rlqNvcczwUf
2737+
J2DQeLHqR/tsch7S01hGpPAptBeu19PyAlQsntYN0yLCLKoe9dFXWCDkvd1So5LF
2738+
6So+ryPqupumBbh4WxCmTp9qwDJYJItjAE0zyPe890FurOtxrFTwtRtX6d6qGKkY
2739+
/B4T3r0tTE1EiOUpmSnxmGNItMh7/l5UtnHjABEBAAHOwE0EXceB0wEIAK7dVAoq
2740+
ZqBw9twxk6psNcTmIrfQbvjasKl/+PfLCfBNklD/nwe0CLz799fFSFMezCg43ZPC
2741+
KIescCQ5t74r0D6O/QTGMpUyZD+w4JhZkMQYy2HjImfMNtPVOWb+XaLku/RloPt9
2742+
MSG2mtA25TTp295N4mzMPKq0r1PzSa8jj4Yfn3AzzSXXLq6PwoDiljQ91IWBvJL2
2743+
IAUAMaxSxzq3UqJnlbX2h0yMM+VC0nbSmbkK8mUNltg1EnngJKV1mKRG+Y1GDmZZ
2744+
1Es19tEwUMsV9x1gt05YlecC31woUkL0//8i1kWuWG7dqRMf/8cXaTFA1brVJ33b
2745+
/G0VQP/a03UaVd8AEQEAAcLAdgQYAQgAIBYhBGNe5ic0Xzwd1CKy4gfTUWggvPax
2746+
BQJdx4HTAhsMAAoJEAfTUWggvPaxrJIIAKJsimeWznAmR9fUH/u0ONaTaEQZlhwB
2747+
KvTGn8MPBKAnl50HK5A1AXtEe4KTSR7ohAZ/K0wsmVd4Qi7v0O+A9qTEE/mIb5zT
2748+
3kVuFG772cISRGpC+inh8Dtl2G56s7K45tbPz6jdnZHLBY9eUr4X/2ImI7+q2+Z0
2749+
5G6KQm031XGC8BS8A1lG2XOMvb3qnRMnMapeHJ6vjoIeX9iPtO1foSmdkOCJpBs5
2750+
ZEU5nnHzXEjv1tAPsTAPN+vBAduNAOSqGTA6hXparbf1loeHqnsZcedCQMxDQf/t
2751+
ja3Do8flUzx8MmQkoXY8i6QmtRdrToqqt1n1jGq9Ka7lRjq0xJHAZak=
2752+
=bIm3
2753+
-----END PGP PUBLIC KEY BLOCK-----
2754+
27022755
pub 083891AD4774845A
27032756
uid Eclipse Project for JAXB <jaxb-dev@eclipse.org>
27042757

@@ -2984,6 +3037,31 @@ FJXLEW77wWHN+QpRD6BShYZDvUA2mtO0zlB8reU+VCxgnFfm66DkUg==
29843037
=jYDe
29853038
-----END PGP PUBLIC KEY BLOCK-----
29863039

3040+
pub 17A27CE7A60FF5F0
3041+
sub E86F52398AF20855
3042+
-----BEGIN PGP PUBLIC KEY BLOCK-----
3043+
3044+
mQENBF/AfL8BCADpdkr7+1epRZLZJ6/si+Aj6fmELbzWHZmSSUYmRszcCgPq78xy
3045+
bsW/d0grOOEEn9I/5N22gOoEumcFAsN6hn1thjsZyXLmaBfRj+8vri/zigAqrE7W
3046+
zk7mKKK3IUuEi1rDqoEwGQbzHFP9UxiIouiWbYGhbkER0E8zDwmPlWZDXoQEzqWT
3047+
KcgxAXldiZ6l0FACtxgU3n9oOq0hNQBqfpn22BM2FPjZDrM4rEfbeSt8ztORIviw
3048+
7G9oUtYsbTbDvvADCL0wW05GcNz6BvcmDm79d+fk+5gb+GIaHurWuyTtmw5HCeXW
3049+
QcKN1S96Wfm5Dz6UMOMeXujlvK1rxmsIIl3BABEBAAG5AQ0EX8B8vwEIAOkm8U7a
3050+
QLAJ0FtUuY6ru+JQM3yHhIBA7dADpoyq+f/WN86Es9vw7gavO6tnJPnYh1IozEmQ
3051+
4/OaXfKir2G8geLR6hvCsclgXT+RUS9Z60XBFWWhYwX8OrkdfHNnZPeSM8pwiQbh
3052+
L8QGfF5AiJzG34ecIPekBWL0l0nYtVblAHQ5oKCv0h2e/cPylyBgJUGCtF0pLKuY
3053+
l/jeH44UPz6ZUfTL662zbz7AGn8yX62h5PXyH2ZVuuwA2+vuAZCeTP+cQ7OGlIj/
3054+
EDmggsSrcjVa/G/v+O9lPw9SGnnjoEzX+Ng+tEJNUEx22gvAISajFfM+XWVxVEqs
3055+
z0B4U6PLa2feuVsAEQEAAYkBNgQYAQgAIBYhBD8F3anzFzAeknE21BeifOemD/Xw
3056+
BQJfwHy/AhsMAAoJEBeifOemD/XwJ3cH/27Z8H7Bx53msUwaNO0RbWJNz65xrecM
3057+
w5dvRVjjERYm+5UA5oQdySozlgrpWCAx8q13OMVpGRhodebFEqDZDHsjvJgm10Q7
3058+
Q9fHkP56lCgxt68WPwmof8bkTYC8l9PmPfqdJgQlyX0zqOzxjETCfe+f1gc/m1lx
3059+
tgnUeD3/ktyTkYu1hTt8rWM1ceCnZ08bIcjwjFZJDHZl+BmQ52zxUHJ5JAExZNn3
3060+
vWkvn9JHGWPh6M7evaCcNAdv20A9AB45/aZlYRUN8hCI6xpHiMt4/tDbiImzko74
3061+
zzMvjuz0NEEhREM8f0ld3G/7Meh/OudSEgtQAmwJ0UMZWJWaZ0FhnLI=
3062+
=5I6i
3063+
-----END PGP PUBLIC KEY BLOCK-----
3064+
29873065
pub 1A2A1C94BDE89688
29883066
uid Michael Osipov <michaelo@apache.org>
29893067

@@ -3740,6 +3818,21 @@ ZgMBzI+v/ingWOyKpKqhpZR/50PHA0o23zw8P1BGeQOlr4kFNA==
37403818
=jR+6
37413819
-----END PGP PUBLIC KEY BLOCK-----
37423820

3821+
pub 340B090F727518D8
3822+
uid Thomas Ball <tball@google.com>
3823+
3824+
sub 6EAC8515E0EBB87E
3825+
-----BEGIN PGP PUBLIC KEY BLOCK-----
3826+
3827+
xjMEaJzwtxYJKwYBBAHaRw8BAQdAmw8gRfE8mqvum1kG2Zlm6t46bkXFvJIHRVBZ
3828+
OctVLVe0HlRob21hcyBCYWxsIDx0YmFsbEBnb29nbGUuY29tPs44BGic8LcSCisG
3829+
AQQBl1UBBQEBB0A+DJUNDeULyBrFpk3P07SXnEAch7KoDYah6j0PxgnNQgMBCAfC
3830+
fgQYFgoAJhYhBMMlnSDa7ErObVfMgzQLCQ9ydRjYBQJonPC3AhsMBQkFo5qAAAoJ
3831+
EDQLCQ9ydRjY3/MA/38kMom8Qy8gO3AH31GqVqguYruG848SaIJugavlTT4sAP9D
3832+
EfbsFU4kymcgABRT9CyDsNAmI/lxRNEB+pxiNp1/DA==
3833+
=FAP2
3834+
-----END PGP PUBLIC KEY BLOCK-----
3835+
37433836
pub 34918B7D3969D2F5
37443837
uid Brad Corso <bcorso@google.com>
37453838

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)