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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ subprojects {
google()
mavenCentral()
maven {
url "https://jitpack.io"
url = "https://jitpack.io"
content {
includeGroup "com.github.bitfireAT"
}
Expand Down
16 changes: 16 additions & 0 deletions gradle/verification-keyring.keys
Original file line number Diff line number Diff line change
Expand Up @@ -5347,6 +5347,22 @@ ymOZIduHXX1X+KzlRZTXvv4tSFnIQ0mWY1ySiOJQJS2WABVwFpFc8rECm6eN
=z4dc
-----END PGP PUBLIC KEY BLOCK-----

pub 793FD5751A0F0780
uid Block Open Source Releases <oss-releases@block.xyz>

sub 59EF9FBBED4216F5
-----BEGIN PGP PUBLIC KEY BLOCK-----

mDMEZzuZjRYJKwYBBAHaRw8BAQdA/FAoxAeXKY80R8UZ35NNr06SMFqC3Pv/LtP2
sZS+7N60M0Jsb2NrIE9wZW4gU291cmNlIFJlbGVhc2VzIDxvc3MtcmVsZWFzZXNA
YmxvY2sueHl6Prg4BGc7mY0SCisGAQQBl1UBBQEBB0BxT6NyXTVMCaIjZGa2M+/h
z+xbicRNpHTpudCgcUvccwMBCAeIfgQYFgoAJhYhBB0hf4R17unxmrjda3k/1XUa
DweABQJnO5mNAhsMBQkSzAMAAAoJEHk/1XUaDweAmCgA/2x1ZfeK2BbKUoPDvSHk
bdks1K3OorITH/c1RHMJZe1TAP92RwDPmqy7YsZDKctpFeA0jhlWBNvbNTNkzRNu
yEjMCg==
=Eg1b
-----END PGP PUBLIC KEY BLOCK-----

pub 79752DB6C966F0B8
uid Rob Manning <robert.m.manning@gmail.com>

Expand Down
15 changes: 14 additions & 1 deletion gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</trusted-artifacts>
<ignored-keys>
<ignored-key id="2C7F998F4272C851" reason="Key couldn't be downloaded from any key server"/>
<ignored-key id="793FD5751A0F0780" reason="Key couldn't be downloaded from any key server"/>
</ignored-keys>
<trusted-keys>
<trusted-key id="015479E1055341431B4545AB72475FD306B9CAB7" group="com.googlecode.javaewah" name="JavaEWAH" version="1.2.3"/>
Expand Down Expand Up @@ -49,6 +48,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="1D217F8475EEE9F19AB8DD6B793FD5751A0F0780" group="^com[.]squareup($|([.].*))" regex="true"/>
<trusted-key id="1D2C7EF8ADA0F794B58C7C63436902AF59EDF60E">
<trusting group="dev.equo.ide" name="solstice" version="1.7.5"/>
<trusting group="dev.equo.ide" name="solstice" version="1.8.0"/>
Expand Down Expand Up @@ -945,6 +945,14 @@
<sha256 value="6eea2bc150828c8fcba777e93037038e2ee3ec441c43d6acecf2c5cd9ddc5374" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.startup" name="startup-runtime" version="1.2.0">
<artifact name="startup-runtime-1.2.0.aar">
<sha256 value="f51d361d17b30b09cfb9e2aebf301d113f99437cbf462a066092795fb60eddd2" origin="Generated by Gradle"/>
</artifact>
<artifact name="startup-runtime-1.2.0.module">
<sha256 value="39387ad16429950ac100a055bc7cc809b0ecef86da29c5b41f2fb0d2ff063c1c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.test" name="annotation" version="1.0.1">
<artifact name="annotation-1.0.1.aar">
<sha256 value="c0754928effe1968c3a9a7b55d1dfc7ceb1e1e7c9f3f09f98afd42431f712492" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -12103,6 +12111,11 @@
<sha256 value="fe0cd9e32193e453333fd2b1f577e662fb5abc6907102bb967817bc131280fd7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.22">
<artifact name="kotlin-stdlib-1.8.22.pom">
<sha256 value="596f4a62f3086ad98f0e78b3e257ba5b247cd313bffa9818e509696210e83a37" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.0">
<artifact name="kotlin-stdlib-1.9.0.jar">
<sha256 value="35aeffbe2db5aa446072cee50fcee48b7fa9e2fc51ca37c0cc7d7d0bc39d952e" origin="Generated by Gradle"/>
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,20 @@ tasks.withType(SpotBugsTask){task ->
}

android {
compileSdk 35
compileSdk = 35

buildTypes {
debug {
testCoverageEnabled true
testCoverageEnabled = true
}
}

lint {
abortOnError true
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
htmlOutput = file("$project.buildDir/reports/lint/lint.html")
htmlReport = true
warningsAsErrors = true
}

defaultConfig {
Expand All @@ -149,7 +149,7 @@ android {
testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD2", "${NC_TEST_SERVER_PASSWORD2}"
testInstrumentationRunnerArguments disableAnalytics: 'true'

multiDexEnabled true
multiDexEnabled = true
}

compileOptions {
Expand All @@ -172,7 +172,7 @@ android {
}
}

namespace 'com.owncloud.android.lib'
namespace = 'com.owncloud.android.lib'
}

tasks.register("combinedTestReport", JacocoReport) {
Expand Down
8 changes: 4 additions & 4 deletions sample_client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ repositories {
}

android {
compileSdk 35
compileSdk = 35

lintOptions {
abortOnError false
abortOnError = false
}

packagingOptions {
Expand All @@ -44,11 +44,11 @@ android {
minSdkVersion 21
targetSdkVersion 35

multiDexEnabled true
multiDexEnabled = true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
namespace 'com.owncloud.android.lib.sampleclient'
namespace = 'com.owncloud.android.lib.sampleclient'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion sample_client/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
Loading