summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2022-10-23 14:02:08 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2022-10-30 13:21:02 +0100
commit67a2be780b3eb9b87767698cc0594eac4d9d1f82 (patch)
tree13812409760053d3c548515233869266b0971d64
parent25bee28717a64b0613f4be2ee8a7ea63a2e4da39 (diff)
update android gradle plugin to 7.3.1 and gradle to 7.4
and lintoptions are now in a lint block Change-Id: Ia00ee801aa49f40c9b1f19e038c14261f826d431
-rw-r--r--android/sdremote/build.gradle2
-rw-r--r--android/sdremote/gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--android/sdremote/mobile/build.gradle6
3 files changed, 5 insertions, 5 deletions
diff --git a/android/sdremote/build.gradle b/android/sdremote/build.gradle
index 5414a6f..9f3d63a 100644
--- a/android/sdremote/build.gradle
+++ b/android/sdremote/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:7.3.1'
}
}
diff --git a/android/sdremote/gradle/wrapper/gradle-wrapper.properties b/android/sdremote/gradle/wrapper/gradle-wrapper.properties
index 54953ca..b7c3010 100644
--- a/android/sdremote/gradle/wrapper/gradle-wrapper.properties
+++ b/android/sdremote/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-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/android/sdremote/mobile/build.gradle b/android/sdremote/mobile/build.gradle
index 805f3e8..f03aac0 100644
--- a/android/sdremote/mobile/build.gradle
+++ b/android/sdremote/mobile/build.gradle
@@ -6,9 +6,6 @@ android {
versionCode 26
}
- lintOptions {
- abortOnError false
- }
flavorDimensions "default"
productFlavors {
// the full remote including the wearable
@@ -16,6 +13,9 @@ android {
// minimal variant without wearable (and thus without the need for google apis)
minimal.dimension "default"
}
+ lint {
+ abortOnError false
+ }
}
dependencies {