From 6c1130353572f79db7feeae1ad955464a350b9ac Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 17:44:38 -0700 Subject: Update versions --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index f45f13d2..2c684051 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=6492c0c +KAU=b978170 android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3 From fb32d4c051ccdb7cdbede4a36656f6537859f11d Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 21:57:13 -0700 Subject: 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(-) (limited to 'gradle.properties') diff --git a/.travis.yml b/.travis.yml index 448fe17b..84875274 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 1249355d..fdb9ee37 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 013222fb..5a21959f 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 3f23a596..52709f5e 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 2c684051..31d0e5b7 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 29e41345..1acc777d 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 -- cgit v1.2.3 From 141ce15f14b2e0a759d089d3d69de5f1eecdd792 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 22:30:14 -0700 Subject: Fallback to java 8 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 31d0e5b7..b0403ec2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=2ae078c +KAU=e122056 android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3 From 00663adfc197d8ed7283243547f8341a0b18db11 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 30 Aug 2021 02:00:06 -0700 Subject: Fix iconics and android changes --- app/build.gradle | 14 ++++++++++---- app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt | 2 +- .../com/pitchedapps/frost/widgets/NotificationWidget.kt | 2 +- gradle.properties | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) (limited to 'gradle.properties') diff --git a/app/build.gradle b/app/build.gradle index fdb9ee37..71a0832b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -338,10 +338,16 @@ def kotlinResolutions = ['kotlin-reflect', 'kotlin-test-junit5'] configurations.all { - resolutionStrategy.eachDependency { DependencyResolveDetails details -> - def requested = details.requested - if (requested.group == 'org.jetbrains.kotlin' && requested.name in kotlinResolutions) { - details.useVersion kau.Versions.kotlin + resolutionStrategy { + eachDependency { DependencyResolveDetails details -> + def requested = details.requested + if (requested.group == 'org.jetbrains.kotlin' && requested.name in kotlinResolutions) { + details.useVersion kau.Versions.kotlin + } + } + + dependencySubstitution { + substitute module('com.mikepenz:library-typeface-api') using module("com.mikepenz:iconics-typeface-api:${kau.Versions.iconics}") } } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt index 1e2b438e..f5ef0b74 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt @@ -76,7 +76,7 @@ class FrostApp : Application() { L.d { "Activity ${activity.localClassName} destroyed" } } - override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {} + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} override fun onActivityStopped(activity: Activity) {} diff --git a/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt b/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt index 9efe83f6..9c5fbb7d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt @@ -176,7 +176,7 @@ class NotificationWidgetDataProvider( @Volatile private var content: List = emptyList() - private val type = NotificationType.valueOf(intent.getStringExtra(NOTIF_WIDGET_TYPE)) + private val type = NotificationType.valueOf(intent.getStringExtra(NOTIF_WIDGET_TYPE)!!) private val userId = intent.getLongExtra(NOTIF_WIDGET_USER_ID, -1) diff --git a/gradle.properties b/gradle.properties index b0403ec2..56a0cbea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=e122056 +KAU=0c0cc77 android.useAndroidX=true android.enableJetifier=true -- cgit v1.2.3