diff --git a/build.gradle b/build.gradle index 62387ef529..04858bb9aa 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ subprojects { google() mavenCentral() maven { - url "https://jitpack.io" + url = "https://jitpack.io" content { includeGroup "com.github.bitfireAT" } diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 78aa60b56b..0afa0248cc 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -5347,6 +5347,22 @@ ymOZIduHXX1X+KzlRZTXvv4tSFnIQ0mWY1ySiOJQJS2WABVwFpFc8rECm6eN =z4dc -----END PGP PUBLIC KEY BLOCK----- +pub 793FD5751A0F0780 +uid Block Open Source Releases + +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 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dbd59c6cc5..38eb0c6030 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -12,7 +12,6 @@ - @@ -49,6 +48,7 @@ + @@ -945,6 +945,14 @@ + + + + + + + + @@ -12103,6 +12111,11 @@ + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..8bdaf60c75 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7705927e94..48b43d3506 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index 23d15a9367..ef07e0162b 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/library/build.gradle b/library/build.gradle index d2c575fabf..c5a8667d51 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -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 { @@ -149,7 +149,7 @@ android { testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD2", "${NC_TEST_SERVER_PASSWORD2}" testInstrumentationRunnerArguments disableAnalytics: 'true' - multiDexEnabled true + multiDexEnabled = true } compileOptions { @@ -172,7 +172,7 @@ android { } } - namespace 'com.owncloud.android.lib' + namespace = 'com.owncloud.android.lib' } tasks.register("combinedTestReport", JacocoReport) { diff --git a/sample_client/build.gradle b/sample_client/build.gradle index 41a1c50162..3625fcbc79 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -27,10 +27,10 @@ repositories { } android { - compileSdk 35 + compileSdk = 35 lintOptions { - abortOnError false + abortOnError = false } packagingOptions { @@ -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 { diff --git a/sample_client/gradle/wrapper/gradle-wrapper.properties b/sample_client/gradle/wrapper/gradle-wrapper.properties index 89ba202fe8..022370c3ff 100644 --- a/sample_client/gradle/wrapper/gradle-wrapper.properties +++ b/sample_client/gradle/wrapper/gradle-wrapper.properties @@ -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