From fb32d4c051ccdb7cdbede4a36656f6537859f11d Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 29 Aug 2021 21:57:13 -0700
Subject: [PATCH] Update versions

---
 .travis.yml                              | 14 ++++++++++++--
 app/build.gradle                         |  5 +++++
 build.gradle                             |  1 +
 buildSrc/src/main/kotlin/Versions.kt     |  2 +-
 gradle.properties                        |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 448fe17b4..84875274b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,11 @@ jdk:
   - oraclejdk8
 env:
   global:
-    - ANDROID_API=29
-    - ANDROID_BUILD_TOOLS=29.0.2
+    - ANDROID_API=30
+    - EMULATOR_API=19
+    - ANDROID_BUILD_TOOLS=30.0.2
+    - ANDROID_COMMAND_LINE_TOOLS=7583922
+    - ANDROID_HOME=~/android-sdk
     - secure: X3J97ccW+8K0bXPXhX608vPx7Pr/G4ju7quxydqMaYGgClHxoL/WpXOBAyyllde5P28PY4kioaqcI21BEhnAw0QUbmnzVLA1Qd5VS7aMPHpEnInKuOxGZ2d570OZd1f+ozFVt05vzG0VBJlBAkVhz2GWNxQdmIV1sO28MH526JMuYaEREuuywVSZmAeY7AAbW9MeCC2wvHvNmhk2nk6NLRQcsrDHcBsimy9fnnQ9lT/QsvToi1ZJd/MN7YkGDUULR+YmaotBzG546UJ1EiZQX91bFEJfP0oL43Pk7t5snzmHnKjLOr8Mt5QsIUXaiy/uzhUVmuDh1i0GEpZmhqM7nz/T6P7ogaLbbyJeauNmf15nu+e3hSvNiTzKyIwfSSflv8Do3g8/Eo3dKfIi3I8/OKF/uZ76kywh2LRqtZAqxRDiAMDZVwsRgD4aztoWm5AWa3tSoGy1J7i1eoqX6bNqokRbjgheTqcjN13kCdSZi3pZX7UBYm2Vumhn4izhTume19Rh9SqTmRgQ8jM7ynxHh7vVsJPPJG0HbQ623xz+d9mtXGy1fAb0dcUJMXdOhFN3m6AnKuHiF7cmsqje7Euk/TOZyqZmu0xEhTkugMbNKwGrklJiwRr3IoLtPdhLE38u3/auloUqBQ4K/iA9ZdhAreTSHEaI9d3J4N6kqCj3U30=
 android:
   components:
@@ -20,6 +23,13 @@ android:
 git:
   depth: 500
 before_install:
+  # Get Java 11 compatible tools: https://stackoverflow.com/a/68534598/4407321
+  - touch $HOME/.android/repositories.cfg
+  - wget "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_COMMAND_LINE_TOOLS}_latest.zip" -O commandlinetools.zip
+  - unzip commandlinetools.zip -d $ANDROID_HOME/
+  - yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager "platforms;android-${ANDROID_API}" --sdk_root=$ANDROID_HOME
+  - yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" --sdk_root=$ANDROID_HOME
+  # Get Frost content
   - openssl aes-256-cbc -K $encrypted_0454d0cf846c_key -iv $encrypted_0454d0cf846c_iv
     -in files/frost.tar.enc -out files/frost.tar -d
   - tar xvf files/frost.tar
diff --git a/app/build.gradle b/app/build.gradle
index 1249355db..fdb9ee37c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -230,6 +230,8 @@ preBuild.dependsOn(frostWebGen)
 
 repositories {
     google()
+    // Required for exomedia
+    jcenter()
     mavenCentral()
     maven { url "https://jitpack.io" }
 }
@@ -299,6 +301,9 @@ dependencies {
     debugImplementation kau.Dependencies.leakCanary
 
     //Icons
+    implementation kau.Dependencies.iconics
+
+    implementation kau.Dependencies.iconicsGoogle
     implementation kau.Dependencies.iconicsMaterial
     implementation kau.Dependencies.iconicsCommunity
 
diff --git a/build.gradle b/build.gradle
index 013222fb0..5a21959fc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url "https://plugins.gradle.org/m2/" }
     }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 3f23a5960..52709f5eb 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
 
-    const val targetSdk = 29
+    const val targetSdk = 30
 
     // https://developer.android.com/jetpack/androidx/releases/biometric
     const val andxBiometric = "1.1.0"
diff --git a/gradle.properties b/gradle.properties
index 2c6840511..31d0e5b7c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.daemon = true
 APP_ID=Frost
 APP_GROUP=com.pitchedapps
 
-KAU=b978170
+KAU=2ae078c
 
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 29e413457..1acc777d7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists