Merge branch 'update-android-ci-configuration'

3 files changed, 11 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 6071ee8f5d..ea7e9f0f0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,8 @@ matrix:
       name: Android
       android:
         components:
-          - android-29
-          - build-tools-29.0.3
+          - android-30
+          - build-tools-30.0.3
       install:
         - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable --profile minimal -y
         - source $HOME/.cargo/env
@@ -54,7 +54,7 @@ matrix:
         - sudo /opt/android/android-ndk-r20/build/tools/make-standalone-toolchain.sh --platform=android-21 --arch=arm64 --install-dir=/opt/android/toolchains/android21-aarch64
         - sudo apt install tidy
         - |
-            curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.37.0/ktlint &&
+            curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.40.0/ktlint &&
             chmod a+x ktlint &&
             sudo mv ktlint /usr/local/bin/
         - |
@@ -63,6 +63,8 @@ matrix:
             ar = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar"
             linker = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"
       before_script:
+        - mkdir "$ANDROID_HOME/licenses" || true
+        - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
         - export RUSTFLAGS="--deny warnings"
         - export AR_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android-ar
         - export CC_aarch64_linux_android=/opt/android/toolchains/android21-aarch64/bin/aarch64-linux-android21-clang
diff --git a/android/.idea/modules/android.iml b/android/.idea/modules/android.iml
index 40d7ad90fc..8914760316 100644
--- a/android/.idea/modules/android.iml
+++ b/android/.idea/modules/android.iml
@@ -31,7 +31,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5564e21ca78dd9fcee25669a18ec46fc/material-1.2.1-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c6dba395b39ae60d0b64f9859d4d14e7/appcompat-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/47c8638a26572d48a70e74dd8429455a/jetified-viewpager2-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/dcc35aef0d56e2deed08a3d93c779029/recyclerview-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/e4ae9586f12aed62661d019828be3b85/fragment-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/a3fe9d248ef861c66d2b143f212f7c6c/jetified-appcompat-resources-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/95e09ad0dc3836788097726f40ea29aa/drawerlayout-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/fce13c7257385746e294baf89005c72a/coordinatorlayout-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/7c99cbd33c7bebbfd13b3f30a08b5657/viewpager-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/240de28e925eb0a9a86cb995a8701721/customview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/9e6b134d6f7d8057318be9df7947bc22/transition-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/f7566fec3124c60c310004bc0177598e/vectordrawable-animated-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/207a08f434b021048a49b2b0c64eaf90/vectordrawable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1055c050b93f211dab8d7c18e5b2495b/loader-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/757dd1942480ac492133be4966c1650f/jetified-activity-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c0b1e6770811228c1315aaba4e2ffe47/core-1.3.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5c115b91931650400984c74d4d99cc90/cursoradapter-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ccdb1909d710dcf774a1ec8ad93baf42/versionedparcelable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/0ac30cbae7e71bdbd89eaa556640faf3/cardview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/8f079d79c5cb9d8009006c3b84779ef0/lifecycle-runtime-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/0aa1977f62603b02946e188d5e433843/lifecycle-viewmodel-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/abe820ad568b41b2bef08d37091aa7ec/jetified-savedstate-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/bbcab19646c030539b44bcab889521c5/lifecycle-livedata-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/2f2ef161da37b6092e7702a4c52959db/lifecycle-livedata-core-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/920333431c4c0ca4b73d5e47e973e483/core-runtime-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/00bac86cd7b725fe6ccd046fb9c2bc5d/interpolator-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/84bd64cdb1248222f50650b2d10dcc20/jetified-annotation-experimental-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/2cfca2db1f1c374607b8948df49f5e9e/jetified-commons-validator-1.7.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1b75ca76ff267a6010352d134b8f87a4/jetified-commons-beanutils-1.9.4.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/052f550d4a0c65a0d87a79f0961fec0b/jetified-commons-logging-1.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1badcf71d3dda9b8167362628b2bbf0c/jetified-commons-collections-3.2.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5f4141f39976d201be8dcecb11ecbd98/jetified-commons-digester-2.1.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/fe534f91e4d4bd14e465d771d89232ca/jetified-joda-time-2.10.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/8faeecc38c97667dcbc9da48dd8b2db2/jetified-kotlinx-coroutines-android-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/54d6d0be8cfd548514c298e1a96e1514/jetified-kotlinx-coroutines-core-jvm-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ced1359422368169f6e97fb698b0a0d1/jetified-kotlin-stdlib-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c62b5a4b3b40490a670fdc7b19375a02/jetified-kotlin-stdlib-common-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/d8ae92b2cde1fe8fd7fad34031400c9e/jetified-annotations-13.0.jar:/Users/aleksandrgranin/Library/Android/sdk/platforms/android-29/android.jar:/Users/aleksandrgranin/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/d0a65dd5552a975e6239034b31349b7f/transformed/material-1.2.1-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/64c03afccf9019196068a1000c010482/transformed/appcompat-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/b98000071bc18bac801fb9d321621932/transformed/jetified-viewpager2-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/5329a5cd405ade02c50ec7033b50e50c/transformed/recyclerview-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/e04432edb1de11141009be4928f477ed/transformed/fragment-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ab0c07b4ce1a12e371e435156117761d/transformed/jetified-appcompat-resources-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/9137c020b47361a0afac6c07b31d0057/transformed/drawerlayout-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ffb867791d790325c47c560485ea8e8d/transformed/coordinatorlayout-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/52af50fae314f7bdc01a868039e263cd/transformed/viewpager-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/c8067b1c219d139714c353ddbe5492f5/transformed/customview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/d4583482cf0b3b26cba1c4437c15e092/transformed/transition-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/41f1afeed5b811945f2dc51c0860d632/transformed/vectordrawable-animated-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/0ce0b00fe93cf623edf5646e588e94ab/transformed/vectordrawable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/c75c6c73f16d777c26392338dfe57449/transformed/loader-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/645ffe1d911fa16caaf6428110496742/transformed/jetified-activity-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/477daa2da44e6acc83d1d91cb288e8a6/transformed/core-1.3.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/7acf0071f81c4d539febd943e21a1060/transformed/cursoradapter-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/fcf9451f0f905d9348f633e1ea0fe248/transformed/versionedparcelable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/e38921028663005d568d63cc2db36b94/transformed/cardview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/83c5dcb05c07136fdd0d06357b70082e/transformed/lifecycle-runtime-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/9c9552ea6970d86ca53749943ac68400/transformed/lifecycle-viewmodel-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/1c0ec23c27262d1594f0a69d27735e3c/transformed/jetified-savedstate-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/662ce10131f77f172cb0fe380185213a/transformed/lifecycle-livedata-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/d797bfaaed24da77ec42ea0b7fed5d97/transformed/lifecycle-livedata-core-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/4a2a9a1f28a7291ea7444c776a7f83d7/transformed/core-runtime-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/13f29bba78bf917647c0c408cdffbb5e/transformed/interpolator-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/404e3022a656b2ea4b411b602a8de396/transformed/jetified-annotation-experimental-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/6f39c3909a713b91f3ff47d9777e6e95/transformed/jetified-commons-validator-1.7.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/79f8a7e33fc0be48aa253f30c757433a/transformed/jetified-commons-beanutils-1.9.4.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/cbf4d94b5ed36b2dfa0698a364c92fb7/transformed/jetified-commons-logging-1.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ec4b6bd7e9bbfce6d6f2447d9d3441ae/transformed/jetified-commons-collections-3.2.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ee84fa3f9259ff6bdb87f1d9870e80ff/transformed/jetified-commons-digester-2.1.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/dc0f1b855f1be392e97d0d418570091f/transformed/jetified-joda-time-2.10.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/0e8a2a42fe4c82aec6a1653c23b9d891/transformed/jetified-kotlinx-coroutines-android-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/7e2ee142673509ff0c25e15adf374106/transformed/jetified-kotlinx-coroutines-core-jvm-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/a08c72d33f09118b2ae811ee38fdc5b3/transformed/jetified-kotlin-stdlib-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/441993b51adbb0599cb5065c3d2399ff/transformed/jetified-kotlin-stdlib-common-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/45cbaac403abbc4ce2218947c4c1d10d/transformed/jetified-annotations-13.0.jar:/Users/aleksandrgranin/Library/Android/sdk/platforms/android-30/android.jar:/Users/aleksandrgranin/Library/Android/sdk/build-tools/30.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="android_debug" />
@@ -64,7 +64,7 @@
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
@@ -109,4 +109,4 @@
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index e38de370a1..60b831d41c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -14,13 +14,13 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "net.mullvad.mullvadvpn"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 21010099
         versionName "2021.1"
     }