From f7cd264e0cb9d3655a2b34cd5481f1b461e08bab Mon Sep 17 00:00:00 2001 From: timklge <2026103+timklge@users.noreply.github.com> Date: Sun, 11 May 2025 16:27:37 +0200 Subject: [PATCH] Remove crashlytics and google services (#130) --- .github/workflows/android.yml | 1 - app/.gitignore | 3 +-- app/build.gradle.kts | 32 ++------------------------------ build.gradle.kts | 2 -- gradle/libs.versions.toml | 8 +------- 5 files changed, 4 insertions(+), 42 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bf7b972..e75a473 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,7 +25,6 @@ jobs: echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> $GITHUB_ENV echo "KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> $GITHUB_ENV echo "KEYSTORE_BASE64=${{ secrets.KEYSTORE_BASE64 }}" >> $GITHUB_ENV - echo "GOOGLE_SERVICES_JSON_BASE64=${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}" >> $GITHUB_ENV echo "BUILD_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV - uses: actions/checkout@v4 - name: set up JDK 17 diff --git a/app/.gitignore b/app/.gitignore index 2abde4a..42afabf 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1 @@ -/build -/google-services.json +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d1b7087..466f95a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,8 +5,6 @@ plugins { alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.compose.compiler) kotlin("plugin.serialization") version "2.0.20" - alias(libs.plugins.google.gms.google.services) - alias(libs.plugins.google.firebase.crashlytics) } android { @@ -37,9 +35,6 @@ android { buildTypes { debug { isMinifyEnabled = false - firebaseCrashlytics { - mappingFileUploadEnabled = false - } } release { signingConfig = signingConfigs.getByName("release") @@ -60,24 +55,6 @@ android { } } -tasks.register("addGoogleServicesJson") { - description = "Adds google-services.json to the project" - group = "build" - - doLast { - val googleServicesJson = System.getenv("GOOGLE_SERVICES_JSON_BASE64") - ?.let { Base64.getDecoder().decode(it) } - ?.let { String(it) } - if (googleServicesJson != null) { - val jsonFile = file("$projectDir/google-services.json") - jsonFile.writeText(googleServicesJson) - println("Added google-services.json to the project") - } else { - println("No GOOGLE_SERVICES_JSON_BASE64 environment variable found, skipping...") - } - } -} - tasks.register("generateManifest") { description = "Generates manifest.json with current version information" group = "build" @@ -93,11 +70,8 @@ tasks.register("generateManifest") { "latestVersionCode" to android.defaultConfig.versionCode, "developer" to "github.com/timklge", "description" to "Open-source extension that provides headwind direction, wind speed, forecast and other weather data fields.", - "releaseNotes" to "* Reduce refresh rate on K2, add refresh rate setting\n" + - "* Fix weather data download from Open-Meteo via iOS companion app (thx @keefar!)\n" + - "* Remove custom wind speed unit setting and always use imperial / metric as set in profile\n" + - "* Add relative grade, relative elevation gain data fields\n" + - "* Add OpenWeatherMap support contributed by lockevod\n", + "releaseNotes" to "* Remove crashlytics\n" + + "* Reduce refresh rate on K2, add refresh rate setting\n" + "screenshotUrls" to listOf( "https://github.com/timklge/karoo-headwind/releases/latest/download/preview1.png", "https://github.com/timklge/karoo-headwind/releases/latest/download/preview3.png", @@ -114,7 +88,6 @@ tasks.register("generateManifest") { tasks.named("assemble") { dependsOn("generateManifest") - dependsOn("addGoogleServicesJson") } dependencies { @@ -129,6 +102,5 @@ dependencies { implementation(libs.androidx.glance.appwidget) implementation(libs.androidx.glance.appwidget.preview) implementation(libs.androidx.glance.preview) - implementation(libs.firebase.crashlytics) testImplementation(kotlin("test")) } diff --git a/build.gradle.kts b/build.gradle.kts index 8f0e3e5..f41eb6b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,4 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false alias(libs.plugins.compose.compiler) apply false - alias(libs.plugins.google.gms.google.services) apply false - alias(libs.plugins.google.firebase.crashlytics) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8ce31f7..db38b1e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,20 +11,15 @@ androidxComposeMaterial = "1.3.1" glance = "1.1.1" kotlinxSerializationJson = "1.8.0" mapboxSdkTurf = "7.3.1" -firebaseCrashlytics = "19.4.2" -googleGmsGoogleServices = "4.4.2" -googleFirebaseCrashlytics = "3.0.3" [plugins] android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -google-gms-google-services = { id = "com.google.gms.google-services", version.ref = "googleGmsGoogleServices" } -google-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "googleFirebaseCrashlytics" } [libraries] androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" } -hammerhead-karoo-ext = { group = "io.hammerhead", name = "karoo-ext", version = "1.1.3" } +hammerhead-karoo-ext = { group = "io.hammerhead", name = "karoo-ext", version = "1.1.5" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" } # compose @@ -43,7 +38,6 @@ androidx-glance-appwidget-preview = { group = "androidx.glance", name = "glance- androidx-glance-preview = { group = "androidx.glance", name = "glance-preview", version.ref = "glance" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } mapbox-sdk-turf = { module = "com.mapbox.mapboxsdk:mapbox-sdk-turf", version.ref = "mapboxSdkTurf" } -firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics", version.ref = "firebaseCrashlytics" } [bundles] androidx-lifeycle = ["androidx-lifecycle-runtime-compose", "androidx-lifecycle-viewmodel-compose"]