summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2022-02-04 23:34:29 +0100
committerArne Schwabe <arne@rfc2549.org>2022-02-04 23:39:27 +0100
commit4f0c7947942d8fa14b880060b04e6305e5862978 (patch)
treebf60fded444b0ebffa272de637104aa7cb6c70f6
parent97546b9f8b51c0dc60d591b96ae835f00f2b6805 (diff)
Update gradle version
-rw-r--r--build.gradle.kts2
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--main/build.gradle.kts9
-rw-r--r--tlsexternalcertprovider/build.gradle6
4 files changed, 9 insertions, 10 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index d4cec0af..93f27cd3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("com.android.tools.build:gradle:7.0.4")
+ classpath("com.android.tools.build:gradle:7.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e18612e1..a48ba00b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index fc523b7b..355a429e 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -74,9 +74,9 @@ android {
}
lint {
- enable("BackButton", "EasterEgg", "StopShip", "IconExpectedSize", "GradleDynamicVersion", "NewerVersionAvailable")
- warning("ImpliedQuantity", "MissingQuantity")
- disable("MissingTranslation", "UnsafeNativeCodeLocation")
+ enable += setOf("BackButton", "EasterEgg", "StopShip", "IconExpectedSize", "GradleDynamicVersion", "NewerVersionAvailable")
+ checkOnly += setOf("ImpliedQuantity", "MissingQuantity")
+ disable += setOf("MissingTranslation", "UnsafeNativeCodeLocation")
}
buildTypes {
@@ -89,8 +89,7 @@ android {
}
}
}
-
- flavorDimensions("implementation")
+ flavorDimensions += listOf("implementation")
productFlavors {
create("ui") {
diff --git a/tlsexternalcertprovider/build.gradle b/tlsexternalcertprovider/build.gradle
index 667df3d9..ddf7cafd 100644
--- a/tlsexternalcertprovider/build.gradle
+++ b/tlsexternalcertprovider/build.gradle
@@ -35,11 +35,11 @@ android {
targetCompatibility 1.8
sourceCompatibility 1.8
}
-
- // This is just a demo package, don't care about it being perfect
- lintOptions {
+ lint {
abortOnError false
}
+
+ // This is just a demo package, don't care about it being perfect
}
dependencies {