aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/build.gradle14
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/widgets/NotificationWidget.kt2
-rw-r--r--gradle.properties2
4 files changed, 13 insertions, 7 deletions
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<NotificationContent> = 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