[orbot/master] Update to latest Android API 30. Update dependencies. - tor-commits

23 Dec 2020

commit d0aa2e01e544871ee92fc8001f0468a3271daaf8
Author: Benjamin Erhart berhart@netzarchitekten.com
Date:   Tue Dec 15 12:08:49 2020 +0100
Update to latest Android API 30. Update dependencies.
---
 app-mini/build.gradle         |  8 ++++----
 app/build.gradle              |  6 +++---
 appcore/build.gradle          | 10 +++++-----
 build.gradle                  |  2 +-
 intentintegrator/build.gradle |  6 +++---
 orbotservice/build.gradle     |  8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app-mini/build.gradle b/app-mini/build.gradle
index 01b30f4f..dd1914d0 100644
--- a/app-mini/build.gradle
+++ b/app-mini/build.gradle
@@ -30,12 +30,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "org.torproject.android.mini"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     lintOptions {
         checkReleaseBuilds false
@@ -109,7 +109,7 @@ dependencies {
     implementation project(':orbotservice')
     implementation 'com.github.apl-devs:appintro:v4.2.2'
     implementation 'androidx.palette:palette:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation project(path: ':appcore')
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
diff --git a/app/build.gradle b/app/build.gradle
index 8902fcfa..867dcd6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,13 +35,13 @@ android {
         }
     }
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "org.torproject.android"
         versionName getVersionName()
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/appcore/build.gradle b/appcore/build.gradle
index 701ce2bf..035af370 100644
--- a/appcore/build.gradle
+++ b/appcore/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -31,10 +31,10 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation project(path: ':orbotservice')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/build.gradle b/build.gradle
index d99de80f..b4fa04ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.4.10'
+        kotlin_version = '1.4.21'
     }
     repositories {
         jcenter()
diff --git a/intentintegrator/build.gradle b/intentintegrator/build.gradle
index 81efeb31..f5822fc0 100644
--- a/intentintegrator/build.gradle
+++ b/intentintegrator/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index c1b99e7b..877ac512 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     ndkVersion '21.3.6528147'
sourceSets {
@@ -13,7 +13,7 @@ android {
defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -54,7 +54,7 @@ dependencies {
implementation 'androidx.core:core:1.3.2'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
implementation 'com.offbynull.portmapper:portmapper:2.0.5'

    