From 25f82c8d3c83ca6755f982765ddbafe27bc7a5e2 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 26 Jan 2021 16:49:52 +0100 Subject: [PATCH] update dependencies --- Habitica/build.gradle | 40 +++++++++---------- .../habitica/HabiticaBaseApplication.kt | 1 + build.gradle | 12 +++--- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 669be28bf..aa27cd2c1 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -54,8 +54,8 @@ dependencies { implementation 'com.google.firebase:firebase-crashlytics:17.3.0' //Dependency Injection - implementation 'com.google.dagger:dagger:2.29.1' - kapt 'com.google.dagger:dagger-compiler:2.29.1' + implementation 'com.google.dagger:dagger:2.31.2' + kapt 'com.google.dagger:dagger-compiler:2.31.2' compileOnly 'javax.annotation:javax.annotation-api:1.3.2' compileOnly 'com.github.pengrad:jdk9-deps:1.0' //App Compatibility and Material Design @@ -64,34 +64,34 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' // Markdown - implementation "io.noties.markwon:core:4.6.0" - implementation "io.noties.markwon:ext-strikethrough:4.6.0" - implementation "io.noties.markwon:image:4.6.0" - implementation "io.noties.markwon:recycler:4.6.0" - implementation "io.noties.markwon:html:4.6.0" + implementation "io.noties.markwon:core:4.6.1" + implementation "io.noties.markwon:ext-strikethrough:4.6.1" + implementation "io.noties.markwon:image:4.6.1" + implementation "io.noties.markwon:recycler:4.6.1" + implementation "io.noties.markwon:html:4.6.1" //Eventbus implementation 'org.greenrobot:eventbus:3.2.0' // IAP Handling / Verification implementation 'org.solovyev.android:checkout:1.2.2' //Facebook - implementation('com.facebook.android:facebook-android-sdk:7.1.0') { + implementation('com.facebook.android:facebook-android-sdk:8.1.0') { transitive = true } implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar' //RxJava implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' - implementation 'io.reactivex.rxjava3:rxjava:3.0.6' + implementation 'io.reactivex.rxjava3:rxjava:3.0.9' implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1' implementation 'io.reactivex.rxjava2:rxjava:2.2.19' implementation "com.github.akarnokd:rxjava3-bridge:3.0.0" //Analytics - implementation 'com.amplitude:android-sdk:2.25.2' + implementation 'com.amplitude:android-sdk:2.30.0' // Fresco Image Management Library - implementation('com.facebook.fresco:fresco:2.3.0') { + implementation('com.facebook.fresco:fresco:2.4.0') { exclude module: 'bolts-android' } - implementation('com.facebook.fresco:animated-gif:2.3.0') { + implementation('com.facebook.fresco:animated-gif:2.4.0') { exclude module: 'bolts-android' } //Tests @@ -110,10 +110,10 @@ dependencies { //Leak Detection debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5' //Push Notifications - implementation 'com.google.firebase:firebase-core:18.0.0' - implementation 'com.google.firebase:firebase-messaging:21.0.0' - implementation 'com.google.firebase:firebase-config:20.0.1' - implementation 'com.google.firebase:firebase-perf:19.0.10' + implementation 'com.google.firebase:firebase-core:18.0.1' + implementation 'com.google.firebase:firebase-messaging:21.0.1' + implementation 'com.google.firebase:firebase-config:20.0.2' + implementation 'com.google.firebase:firebase-perf:19.1.0' implementation 'com.google.android.gms:play-services-auth:19.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.nex3z:flow-layout:1.2.2' @@ -125,10 +125,10 @@ dependencies { implementation 'androidx.navigation:navigation-ui-ktx:2.3.2' implementation "androidx.paging:paging-runtime-ktx:2.1.2" implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' - implementation 'com.willowtreeapps:signinwithapplebutton:0.2' + implementation 'com.willowtreeapps:signinwithapplebutton:0.3' implementation project(':shared') } @@ -151,7 +151,7 @@ android { resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" versionCode 2693 - versionName "3.1.1" + versionName "3.2" } buildFeatures { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt index 9deca9f11..042b6e886 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt @@ -102,6 +102,7 @@ abstract class HabiticaBaseApplication : Application() { val builder = RealmConfiguration.Builder() .schemaVersion(1) .deleteRealmIfMigrationNeeded() + .allowWritesOnUiThread(true) try { Realm.setDefaultConfiguration(builder.build()) } catch (ignored: UnsatisfiedLinkError) { diff --git a/build.gradle b/build.gradle index 01fb8bf24..8a0656d40 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.4.21' ext.build_tools_version = '29.0.0' - ext.sdk_version = 28 + ext.sdk_version = 30 repositories { google() @@ -11,15 +11,15 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' - classpath "io.realm:realm-gradle-plugin:7.0.8" + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' + classpath "io.realm:realm-gradle-plugin:10.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.1.0" classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0" - classpath 'com.google.firebase:perf-plugin:1.3.1' + classpath 'com.google.firebase:perf-plugin:1.3.4' } }