--- a/app/build.gradle.kts Wed Nov 28 18:12:51 2018 -0800
+++ b/app/build.gradle.kts Wed Nov 28 18:34:47 2018 -0800
@@ -135,6 +135,9 @@
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.1.0")
implementation(group = "com.geekorum", name = "geekdroid", version = "0.0.1", ext = geekdroidExt)
+ create(group = "com.geekorum", name = "geekdroid-firebase", version = "0.0.1", ext = geekdroidExt).also {
+ add("googleImplementation", it)
+ }
implementation("com.google.android.material:material:1.0.0")
implementation("net.opacapp:multiline-collapsingtoolbar:1.3.0")
@@ -169,15 +172,16 @@
androidTestImplementation("androidx.test.ext:truth:1.0.0")
implementation(kotlin("stdlib-jdk8", kotlinVersion))
+
+ val corountinesVersion: String by rootProject.extra
+ enforceCoroutinesPlatform(corountinesVersion)
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$corountinesVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$corountinesVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$corountinesVersion")
implementation("com.jakewharton.timber:timber:4.7.1")
- add("googleImplementation", "com.crashlytics.sdk.android:crashlytics:2.9.6") {
- isTransitive = true
- }
+ add("googleImplementation", "com.crashlytics.sdk.android:crashlytics:2.9.6")
// ensure that the free flavor don't get any firebase dependencies
configurations["freeImplementation"].exclude(group = "com.google.firebase")
}
Binary file app/libs/geekdroid-firebase-0.0.1.aar has changed
--- a/app/src/google/java/com/geekorum/ttrss/logging/LoggingModule.kt Wed Nov 28 18:12:51 2018 -0800
+++ b/app/src/google/java/com/geekorum/ttrss/logging/LoggingModule.kt Wed Nov 28 18:34:47 2018 -0800
@@ -20,6 +20,7 @@
*/
package com.geekorum.ttrss.logging
+import com.geekorum.geekdroid.firebase.logging.CrashlyticsLoggingTree
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoSet
@@ -31,5 +32,8 @@
@Module
class LoggingModule {
@Provides @IntoSet
- fun provideLoggingTree(): Timber.Tree = Timber.DebugTree()
+ fun provideDebugLoggingTree(): Timber.Tree = Timber.DebugTree()
+
+ @Provides @IntoSet
+ fun provideCrashlyticsLoggingTree(): Timber.Tree = CrashlyticsLoggingTree()
}
--- a/app/src/main/java/com/geekorum/ttrss/di/NetworkModule.java Wed Nov 28 18:12:51 2018 -0800
+++ b/app/src/main/java/com/geekorum/ttrss/di/NetworkModule.java Wed Nov 28 18:34:47 2018 -0800
@@ -43,7 +43,9 @@
@Provides
@Singleton
- static OkHttpClient providesOkHttpclient(Cache cache, @Nullable HttpLoggingInterceptor requestLogger, @Nullable RetrofitInvocationLogger retrofitInvocationLogger) {
+ static OkHttpClient providesOkHttpclient(Cache cache,
+ @Nullable HttpLoggingInterceptor requestLogger,
+ @Nullable RetrofitInvocationLogger retrofitInvocationLogger) {
OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder();
if (retrofitInvocationLogger != null) {
okHttpBuilder.addInterceptor(retrofitInvocationLogger);
--- a/settings.gradle.kts Wed Nov 28 18:12:51 2018 -0800
+++ b/settings.gradle.kts Wed Nov 28 18:34:47 2018 -0800
@@ -64,6 +64,7 @@
includeBuild(it) {
dependencySubstitution {
substitute(module("com.geekorum:geekdroid")).with(project(":library"))
+ substitute(module("com.geekorum:geekdroid-firebase")).with(project(":geekdroid-firebase"))
}
}
}