From 42b15aa634f9b99f71793b3728f5121029954eff Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 4 May 2022 19:41:03 -0400 Subject: [PATCH] Remove firebase crashlytics --- app/build.gradle.kts | 12 ++++++------ app/proguard-rules.pro | 1 + build.gradle.kts | 1 - buildSrc/src/main/kotlin/Dependencies.kt | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aa54be830b..56d16f6911 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,10 +10,13 @@ plugins { id(Plugins.kotlinParcelize) id(Plugins.kotlinSerialization) id("com.google.android.gms.oss-licenses-plugin") - id(Plugins.firebaseCrashlytics) id(Plugins.googleServices) apply false } +if (gradle.startParameter.taskRequests.toString().contains("Standard")) { + apply() +} + fun getBuildTime() = DateTimeFormatter.ISO_DATE_TIME.format(LocalDateTime.now(ZoneOffset.UTC)) fun getCommitCount() = runCommand("git rev-list --count HEAD") fun getGitSha() = runCommand("git rev-parse --short HEAD") @@ -146,6 +149,7 @@ dependencies { implementation("androidx.multidex:multidex:2.0.1") implementation("com.google.firebase:firebase-core:20.1.2") + implementation("com.google.firebase:firebase-analytics-ktx:20.1.2") val lifecycleVersion = "2.4.0-rc01" kapt("androidx.lifecycle:lifecycle-compiler:$lifecycleVersion") @@ -300,8 +304,4 @@ tasks { preBuild { dependsOn(formatKotlin, copyHebrewStrings) } -} - -if (gradle.startParameter.taskRequests.toString().contains("Standard")) { - apply(mapOf("plugin" to "com.google.gms.google-services")) -} +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index d6067657c2..7450eac07d 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -11,6 +11,7 @@ -keep,allowoptimization class org.jsoup.** { public protected *; } -keep,allowoptimization class com.google.gson.** { public protected *; } -keep,allowoptimization class com.squareup.duktape.** { public protected *; } +-keep,allowoptimization class app.cash.quickjs.** { public protected *; } -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; } -keep,allowoptimization class eu.davidea.flexibleadapter.** { public protected *; } diff --git a/build.gradle.kts b/build.gradle.kts index aba6b71268..56d2ea65f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,6 @@ subprojects { buildscript { dependencies { - classpath(LegacyPluginClassPath.fireBaseCrashlytics) classpath("com.android.tools.build:gradle:7.1.3") classpath(LegacyPluginClassPath.googleServices) classpath(LegacyPluginClassPath.kotlinPlugin) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index bf5751eefa..15e4b9c123 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -10,7 +10,6 @@ object LegacyPluginClassPath { const val googleServices = "com.google.gms:google-services:4.3.10" const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" const val kotlinSerializations = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}" - const val fireBaseCrashlytics = "com.google.firebase:firebase-crashlytics-gradle:2.3.0" } object AndroidVersions { @@ -24,7 +23,6 @@ object AndroidVersions { object Plugins { const val androidApplication = "com.android.application" - const val firebaseCrashlytics = "com.google.firebase.crashlytics" const val googleServices = "com.google.gms.google-services" const val kapt = "kapt" const val kotlinParcelize = "kotlin-parcelize"