summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2021-09-27 14:55:37 +0200
committerArne Schwabe <arne@rfc2549.org>2021-09-27 14:55:37 +0200
commit10fe1a66e18b156b880682fc7dbf761da03036cb (patch)
tree633b3af1a811961dbd63db59c0f237ce0e5a9ec2
parentf07838fac69a496c19e2ff66fcce500c6764dcbc (diff)
Update build system and API to 31
-rw-r--r--build.gradle.kts2
-rw-r--r--main/build.gradle.kts14
2 files changed, 9 insertions, 7 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 4292bbbc..26b34b8b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("com.android.tools.build:gradle:4.2.2")
+ classpath("com.android.tools.build:gradle:7.0.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 979ec5e7..a8adcdee 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -13,11 +13,13 @@ plugins {
}
android {
- compileSdkVersion(30)
+ compileSdkVersion(31)
+
+ ndkVersion = "23.0.7599858"
defaultConfig {
minSdkVersion(14)
- targetSdkVersion(30)
+ targetSdkVersion(31)
versionCode = 178
versionName = "0.7.24"
@@ -94,11 +96,11 @@ android {
productFlavors {
create("ui") {
- setDimension("implementation")
+ dimension = "implementation"
buildConfigField("boolean", "openvpn3", "true")
}
create("skeleton") {
- setDimension("implementation")
+ dimension = "implementation"
buildConfigField("boolean", "openvpn3", "false")
}
}
@@ -160,7 +162,7 @@ dependencies {
// https://maven.google.com/web/index.html
// https://developer.android.com/jetpack/androidx/releases/core
val preferenceVersion = "1.1.1"
- val coreVersion = "1.2.0"
+ val coreVersion = "1.6.0"
val materialVersion = "1.1.0"
val fragment_version = "1.3.2"
@@ -192,5 +194,5 @@ dependencies {
testImplementation("junit:junit:4.13.2")
testImplementation("org.mockito:mockito-core:3.9.0")
testImplementation("org.robolectric:robolectric:4.5.1")
- testImplementation("androidx.test:core:1.3.0")
+ testImplementation("androidx.test:core:1.4.0")
}