Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NC_TEST_SERVER_PASSWORD=test
NC_TEST_SERVER_USERNAME2=admin
NC_TEST_SERVER_PASSWORD2=admin
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
# android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

Expand All @@ -22,3 +22,13 @@ kotlin.daemon.jvmargs=-Xmx4096m
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.configureondemand=true
android.defaults.buildfeatures.resvalues=true
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
android.enableAppCompileTimeRClass=false
android.usesSdkInManifest.disallowed=false
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
android.builtInKotlin=false
android.newDsl=false
93 changes: 93 additions & 0 deletions gradle/verification-keyring.keys
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,34 @@ xxhY1RITnc2C33wjXAW0h+qq7/7Yq3w3/7ncv9sWIzU=
=3nku
-----END PGP PUBLIC KEY BLOCK-----

pub BF984B4145EA13F7
uid Egor Andreevici <egor@squareup.com>

sub 84761D363E7B0FC4
-----BEGIN PGP PUBLIC KEY BLOCK-----

xsBNBF7rgogBCADU9OwoEFdIgN5U0JU5pI7s3T1T1LeDMzAQ8l2Hq4jFrhnrjcEA
ieDSut1YIv5NTBoZv4CrklaKvvQNUXPvKrFImA4OKhBodKV3wsq2efCATDGa1JAw
VEJx6nJxxMsCLCJvmZsD+YE8/DIBI6jjnjh8jagZVkxkSRPvUIxlZCxytIyqXI0t
O8pLh8+8p5e0PgGb9OoszxEQZdBavsixdpe+0feU9cz0l0jJYx3W4ErZeCGGwNat
UUiW0ctb3iz7BkNhhoV9zepxkSLzCf5zBeyA+WfD34028pAfPpyAfDYXF4x55sVP
/3MdWGB6eU6KzPG2/QV/6or5E+C1yCMrnMy1ABEBAAG0I0Vnb3IgQW5kcmVldmlj
aSA8ZWdvckBzcXVhcmV1cC5jb20+zsBNBF7rgogBCADBMYkuALuhT0pTMowmk/BH
8T9OXsu/a2EkmXf4sZqslcyZF2G3/0iQgXl/fjbVlNyxLi9C/Vl4AAPWLNfDWicw
TAuJIkCX8lyuimpO7FH2Vlr8dwHdyLd+V+LLyTbkfRqKoLDrwg9Uj4CuzH03ABfH
uI9lFKoEZ4zOUunUWugB9rN2wo/BhPmEh/QINqLDXCgYKLDYr8NOLWIfrI8fFuXo
SmjhDKwQzvDjGFXoiBDrwSI7AmaSYAJzgT4f+8yEO9rT2vTrt5wFgcHYjwYKr+RU
yFZh1jHwCSkUQluK4toTeraBxq4yTIKG7cFuer04m2/NhBi3WNwReNQ0E9jBIjNV
ABEBAAHCwHwEGAEIACYWIQQdCoted8Z4p8ckRFq/mEtBReoT9wUCXuuCiAIbDAUJ
A8JnAAAKCRC/mEtBReoT91VqB/9VIYofkP4iSHXbwWrVnc6YDntN6aSvaQlmdinq
bpCC20fG6V93KlIk2xQ91vsm662NJODnvYV3Jt63tDdhgHxFn7UZJ8Vx9EzHslqA
ZZXX0jOQ465YzPPFwCJJP09sHAEb9TwufSCGRijqYsSLReT6bGCCOGM5a4qVPfLF
wU0pSS1Nf1GWk+1zTmfTtfz1cQA6VSHh+jFXVoeFuwFf3WGeY3d9TW1w07cgyQVG
KIqtobtdPkTaKqtvFpiUBg/GqiLijqXgQPBIqy3EaAxhC0qmE5UMgvJ5fD+T4JBG
eQh3BspmZac4oUdxAqzyU5N/Um+w90sQluFqwoVd5FX5i4L3
=ciUG
-----END PGP PUBLIC KEY BLOCK-----

pub C3BAB45F4AF71FAB
uid Yang Song <songya@google.com>

Expand Down Expand Up @@ -2699,6 +2727,31 @@ fVJykhD1P8/4BedOSN7DqsnvIUfFaQ==
=iddT
-----END PGP PUBLIC KEY BLOCK-----

pub 07D3516820BCF6B1
sub 11F4CE313A637CC1
-----BEGIN PGP PUBLIC KEY BLOCK-----

xsBNBF3HgdMBCAC3ET5ipFXdZ9GGMbtsCQ3HGT40saajsNDOdov2nMJxzKkVe3wk
sN3bpgbsqBU9ykVkIhX8zV5+v8DOBzkV0pJ2eLjFa9jBPvNjV+KoK2BAI5pzNzYg
sHPwo1aRXdI0MvCy+7iaIiiGF4/O16AhU4LmALHnaRQZCyuN6VOQ8rlqNvcczwUf
J2DQeLHqR/tsch7S01hGpPAptBeu19PyAlQsntYN0yLCLKoe9dFXWCDkvd1So5LF
6So+ryPqupumBbh4WxCmTp9qwDJYJItjAE0zyPe890FurOtxrFTwtRtX6d6qGKkY
/B4T3r0tTE1EiOUpmSnxmGNItMh7/l5UtnHjABEBAAHOwE0EXceB0wEIAK7dVAoq
ZqBw9twxk6psNcTmIrfQbvjasKl/+PfLCfBNklD/nwe0CLz799fFSFMezCg43ZPC
KIescCQ5t74r0D6O/QTGMpUyZD+w4JhZkMQYy2HjImfMNtPVOWb+XaLku/RloPt9
MSG2mtA25TTp295N4mzMPKq0r1PzSa8jj4Yfn3AzzSXXLq6PwoDiljQ91IWBvJL2
IAUAMaxSxzq3UqJnlbX2h0yMM+VC0nbSmbkK8mUNltg1EnngJKV1mKRG+Y1GDmZZ
1Es19tEwUMsV9x1gt05YlecC31woUkL0//8i1kWuWG7dqRMf/8cXaTFA1brVJ33b
/G0VQP/a03UaVd8AEQEAAcLAdgQYAQgAIBYhBGNe5ic0Xzwd1CKy4gfTUWggvPax
BQJdx4HTAhsMAAoJEAfTUWggvPaxrJIIAKJsimeWznAmR9fUH/u0ONaTaEQZlhwB
KvTGn8MPBKAnl50HK5A1AXtEe4KTSR7ohAZ/K0wsmVd4Qi7v0O+A9qTEE/mIb5zT
3kVuFG772cISRGpC+inh8Dtl2G56s7K45tbPz6jdnZHLBY9eUr4X/2ImI7+q2+Z0
5G6KQm031XGC8BS8A1lG2XOMvb3qnRMnMapeHJ6vjoIeX9iPtO1foSmdkOCJpBs5
ZEU5nnHzXEjv1tAPsTAPN+vBAduNAOSqGTA6hXparbf1loeHqnsZcedCQMxDQf/t
ja3Do8flUzx8MmQkoXY8i6QmtRdrToqqt1n1jGq9Ka7lRjq0xJHAZak=
=bIm3
-----END PGP PUBLIC KEY BLOCK-----

pub 083891AD4774845A
uid Eclipse Project for JAXB <jaxb-dev@eclipse.org>

Expand Down Expand Up @@ -2984,6 +3037,31 @@ FJXLEW77wWHN+QpRD6BShYZDvUA2mtO0zlB8reU+VCxgnFfm66DkUg==
=jYDe
-----END PGP PUBLIC KEY BLOCK-----

pub 17A27CE7A60FF5F0
sub E86F52398AF20855
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQENBF/AfL8BCADpdkr7+1epRZLZJ6/si+Aj6fmELbzWHZmSSUYmRszcCgPq78xy
bsW/d0grOOEEn9I/5N22gOoEumcFAsN6hn1thjsZyXLmaBfRj+8vri/zigAqrE7W
zk7mKKK3IUuEi1rDqoEwGQbzHFP9UxiIouiWbYGhbkER0E8zDwmPlWZDXoQEzqWT
KcgxAXldiZ6l0FACtxgU3n9oOq0hNQBqfpn22BM2FPjZDrM4rEfbeSt8ztORIviw
7G9oUtYsbTbDvvADCL0wW05GcNz6BvcmDm79d+fk+5gb+GIaHurWuyTtmw5HCeXW
QcKN1S96Wfm5Dz6UMOMeXujlvK1rxmsIIl3BABEBAAG5AQ0EX8B8vwEIAOkm8U7a
QLAJ0FtUuY6ru+JQM3yHhIBA7dADpoyq+f/WN86Es9vw7gavO6tnJPnYh1IozEmQ
4/OaXfKir2G8geLR6hvCsclgXT+RUS9Z60XBFWWhYwX8OrkdfHNnZPeSM8pwiQbh
L8QGfF5AiJzG34ecIPekBWL0l0nYtVblAHQ5oKCv0h2e/cPylyBgJUGCtF0pLKuY
l/jeH44UPz6ZUfTL662zbz7AGn8yX62h5PXyH2ZVuuwA2+vuAZCeTP+cQ7OGlIj/
EDmggsSrcjVa/G/v+O9lPw9SGnnjoEzX+Ng+tEJNUEx22gvAISajFfM+XWVxVEqs
z0B4U6PLa2feuVsAEQEAAYkBNgQYAQgAIBYhBD8F3anzFzAeknE21BeifOemD/Xw
BQJfwHy/AhsMAAoJEBeifOemD/XwJ3cH/27Z8H7Bx53msUwaNO0RbWJNz65xrecM
w5dvRVjjERYm+5UA5oQdySozlgrpWCAx8q13OMVpGRhodebFEqDZDHsjvJgm10Q7
Q9fHkP56lCgxt68WPwmof8bkTYC8l9PmPfqdJgQlyX0zqOzxjETCfe+f1gc/m1lx
tgnUeD3/ktyTkYu1hTt8rWM1ceCnZ08bIcjwjFZJDHZl+BmQ52zxUHJ5JAExZNn3
vWkvn9JHGWPh6M7evaCcNAdv20A9AB45/aZlYRUN8hCI6xpHiMt4/tDbiImzko74
zzMvjuz0NEEhREM8f0ld3G/7Meh/OudSEgtQAmwJ0UMZWJWaZ0FhnLI=
=5I6i
-----END PGP PUBLIC KEY BLOCK-----

pub 1A2A1C94BDE89688
uid Michael Osipov <michaelo@apache.org>

Expand Down Expand Up @@ -3740,6 +3818,21 @@ ZgMBzI+v/ingWOyKpKqhpZR/50PHA0o23zw8P1BGeQOlr4kFNA==
=jR+6
-----END PGP PUBLIC KEY BLOCK-----

pub 340B090F727518D8
uid Thomas Ball <tball@google.com>

sub 6EAC8515E0EBB87E
-----BEGIN PGP PUBLIC KEY BLOCK-----

xjMEaJzwtxYJKwYBBAHaRw8BAQdAmw8gRfE8mqvum1kG2Zlm6t46bkXFvJIHRVBZ
OctVLVe0HlRob21hcyBCYWxsIDx0YmFsbEBnb29nbGUuY29tPs44BGic8LcSCisG
AQQBl1UBBQEBB0A+DJUNDeULyBrFpk3P07SXnEAch7KoDYah6j0PxgnNQgMBCAfC
fgQYFgoAJhYhBMMlnSDa7ErObVfMgzQLCQ9ydRjYBQJonPC3AhsMBQkFo5qAAAoJ
EDQLCQ9ydRjY3/MA/38kMom8Qy8gO3AH31GqVqguYruG848SaIJugavlTT4sAP9D
EfbsFU4kymcgABRT9CyDsNAmI/lxRNEB+pxiNp1/DA==
=FAP2
-----END PGP PUBLIC KEY BLOCK-----

pub 34918B7D3969D2F5
uid Brad Corso <bcorso@google.com>

Expand Down
34 changes: 34 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache"/>
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
<trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
<trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>
<trusted-key id="1D217F8475EEE9F19AB8DD6B793FD5751A0F0780" group="^com[.]squareup($|([.].*))" regex="true"/>
<trusted-key id="1D2C7EF8ADA0F794B58C7C63436902AF59EDF60E">
<trusting group="dev.equo.ide" name="solstice" version="1.7.5"/>
Expand Down Expand Up @@ -3860,6 +3861,14 @@
<sha256 value="5c4df7b2e31f17f20e4b8dbd62a2b7865a09a49a1fd2931a359fd394ecb9b5a5" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.android.tools.build" name="bundletool" version="1.18.3">
<artifact name="bundletool-1.18.3.jar">
<sha256 value="ccad18514fd97db010856b2bbed40f481f8ba9349368c97ae54d72e3567d0171" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="bundletool-1.18.3.pom">
<sha256 value="fa674b39b96cae98015f3850f366cfeb00fe6c7aea2d90b20c017b90e0996dae" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle" version="8.10.1">
<artifact name="gradle-8.10.1.jar">
<sha256 value="a0fe22ce029c548335a75913f7ad517c827c567b8abb84047102034255ae1173" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -9628,6 +9637,11 @@
<sha256 value="c01c4cda5e408f41ed1d83e4a0a170cf53801b6338aba49f0f904786bc1214fc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.17.1">
<artifact name="commons-codec-1.17.1.pom">
<sha256 value="7fa0db4d8150daf932958b8aea89ee24abb4d18e2316a5de535278fc131512a0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.2">
<artifact name="commons-codec-1.2.jar">
<sha256 value="9898a3b3857676128987b975d0b0f035becf3da5cf677266a34d6636f2b80542" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -10950,6 +10964,11 @@
<sha256 value="675bb023c9beedde3232949979b9742a5fea946280a55a1b462d4ca7801088cd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.27.1">
<artifact name="commons-compress-1.27.1.pom">
<sha256 value="df8cc1a8387d4ce842363b7209fdc6d35df9763839fd3fcab558a0f83f9d841c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-lang3" version="3.14.0">
<artifact name="commons-lang3-3.14.0.jar">
<sha256 value="7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c" origin="Generated by Gradle"/>
Expand All @@ -10958,6 +10977,11 @@
<sha256 value="110438863bad37c28f906bf87016e38c7a8c758ba321e09d11dc5a2363a8e79e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-lang3" version="3.16.0">
<artifact name="commons-lang3-3.16.0.pom">
<sha256 value="e280383956c2e72c1deb3a307b3b75f05ee43649b7d43f0215f7b6c7b15eea2c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-lang3" version="3.17.0">
<artifact name="commons-lang3-3.17.0.jar">
<sha256 value="6ee731df5c8e5a2976a1ca023b6bb320ea8d3539fbe64c8a1d5cb765127c33b4" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -11024,6 +11048,11 @@
<sha256 value="95b7be70f316ae4ca22f6fbdd08de2182e87cd874a650de7c3d3386a747a82a3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="72">
<artifact name="commons-parent-72.pom">
<sha256 value="4345debfc767b1aeac68abdd72fc67d18b521d4b390372a11b63ff0c586b2320" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-parent" version="73">
<artifact name="commons-parent-73.pom">
<sha256 value="4ed44560b07f8448479dfd1e83a422ba4e83e60b36e51b2871ac502a6d5c1bea" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -12679,6 +12708,11 @@
<sha256 value="5e020887aec0d89a9c168efd91aed62865553877f9303f145dbcb9d23ba60dc7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.2.10">
<artifact name="kotlin-reflect-2.2.10.pom">
<sha256 value="ae46614906414404cefc41a467435205d6dee67a2390598328a639ad2bacbd11" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.0.10">
<artifact name="kotlin-script-runtime-2.0.10.jar">
<sha256 value="58f4f7ad99a4a045964b44fe55f0b2604d2c5f51ff4d97c7e6817983fdf92ea7" origin="Generated by Gradle"/>
Expand Down
9 changes: 6 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
junit_version = '4.13.2'
}
dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath 'com.android.tools.build:gradle:9.0.0'
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
Expand Down Expand Up @@ -125,21 +125,23 @@ android {

buildTypes {
debug {
testCoverageEnabled = true
enableUnitTestCoverage true
enableAndroidTestCoverage true
}
}


lint {
abortOnError = true
disable 'MissingTranslation', 'GradleDependency', 'VectorPath', 'IconMissingDensityFolder', 'IconDensities', 'GoogleAppIndexingWarning', 'MissingDefaultResource', 'StringFormatInvalid', 'MissingQuantity', 'InvalidPackage'
htmlOutput = file("$project.buildDir/reports/lint/lint.html")
htmlReport = true
warningsAsErrors = true
targetSdk 36
}

defaultConfig {
minSdkVersion 21
targetSdkVersion 36

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

testOptions {
unitTests.returnDefaultValues = true
targetSdk 36
}

packagingOptions {
Expand Down
8 changes: 4 additions & 4 deletions sample_client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:8.13.2'
classpath 'com.android.tools.build:gradle:9.0.0'
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
Expand All @@ -29,9 +29,6 @@ repositories {
android {
compileSdk = 36

lintOptions {
abortOnError = false
}

packagingOptions {
resources {
Expand All @@ -49,6 +46,9 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
namespace = 'com.owncloud.android.lib.sampleclient'
lint {
abortOnError false
}
}

dependencies {
Expand Down
Loading