diff --git a/.gitignore b/.gitignore index a9e00e10..dc8e5e70 100644 --- a/.gitignore +++ b/.gitignore @@ -559,3 +559,4 @@ obj/ # End of https://www.toptal.com/developers/gitignore/api/python,android,androidstudio,intellij+all,windows,linux,macos,sublimetext,java,kotlin,circuitpython /zeapp/app/release/output-metadata.json /zeapp/app/debug/output-metadata.json +/zeapp/versions.properties diff --git a/zeapp/android/build.gradle.kts b/zeapp/android/build.gradle.kts index 7c0eec1b..a9e37ba5 100644 --- a/zeapp/android/build.gradle.kts +++ b/zeapp/android/build.gradle.kts @@ -9,9 +9,6 @@ plugins { alias(libs.plugins.detekt.gradle) alias(libs.plugins.dagger.hilt) alias(libs.plugins.kotlin.kapt) - alias(libs.plugins.google.play.services) - alias(libs.plugins.firebase.appdistribution) - alias(libs.plugins.firebase.crashlytics) alias(libs.plugins.license.report.gradle) alias(libs.plugins.baselineprofile) } @@ -84,11 +81,6 @@ android { "OPEN_API_TOKEN", "\"${System.getenv("DALE2_TOKEN")}\"", ) - - firebaseAppDistribution { - releaseNotesFile = "./release-notes.txt" - groups = "testers" - } } create("benchmark") { signingConfig = signingConfigs.getByName("debug") @@ -185,9 +177,6 @@ dependencies { implementation(libs.dagger.hilt) implementation(libs.coil.compose) implementation(libs.coil.transformations) - implementation(platform(libs.firebase)) - implementation(libs.firebase.analytics) - implementation(libs.firebase.crashlytics) implementation(libs.timber) debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.test.manifest) diff --git a/zeapp/android/google-services.json b/zeapp/android/google-services.json deleted file mode 100644 index a86758e2..00000000 --- a/zeapp/android/google-services.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "project_info": { - "project_number": "1040506214697", - "project_id": "zebadge-5e919", - "storage_bucket": "zebadge-5e919.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:1040506214697:android:e8b555e4a4785e5b1fff38", - "android_client_info": { - "package_name": "de.berlindroid.zeapp" - } - }, - "oauth_client": [ - { - "client_id": "1040506214697-dpalvub8l30gnvndpst89hu7f5lj7vr4.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAKmexiyl9QGDJwMGJkss7_ydse34fIrac" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "1040506214697-dpalvub8l30gnvndpst89hu7f5lj7vr4.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/zeapp/build.gradle.kts b/zeapp/build.gradle.kts index ad3284d3..fd8ae283 100644 --- a/zeapp/build.gradle.kts +++ b/zeapp/build.gradle.kts @@ -6,9 +6,6 @@ plugins { alias(libs.plugins.kotlin.kapt) apply false alias(libs.plugins.detekt.gradle) apply false alias(libs.plugins.dagger.hilt) apply false - alias(libs.plugins.google.play.services) apply false - alias(libs.plugins.firebase.appdistribution) apply false - alias(libs.plugins.firebase.crashlytics) apply false alias(libs.plugins.license.report.gradle) apply false id("com.android.test") version "8.0.2" apply false kotlin("multiplatform").version("1.9.10").apply(false) diff --git a/zeapp/gradle/libs.versions.toml b/zeapp/gradle/libs.versions.toml index 98e4b7be..9f44f745 100644 --- a/zeapp/gradle/libs.versions.toml +++ b/zeapp/gradle/libs.versions.toml @@ -7,9 +7,6 @@ android-library = { id = "com.android.library", version.ref = "android-gradle-pl baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark"} dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt" } detekt-gradle = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" } -firebase-appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase-appdistribution" } -firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" } -google-play-services = { id = "com.google.gms.google-services", version.ref = "google-play-services" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } ktlint-gradle = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" } @@ -32,10 +29,6 @@ core-ktx = "1.12.0" dagger-hilt = "2.48.1" detekt-gradle = "1.23.1" espresso-core = "3.5.1" -firebase = "32.3.1" -firebase-appdistribution = "4.0.0" -firebase-crashlytics = "2.9.9" -google-play-services = "4.4.0" jSerialComm = "2.10.3" junit = "4.13.2" kotlin = "1.9.10" @@ -73,9 +66,6 @@ core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger-hilt" } dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger-hilt" } espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } -firebase = { module = "com.google.firebase:firebase-bom", version.ref = "firebase" } -firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" } -firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" } jSerialComm = { module = "com.fazecast:jSerialComm", version.ref = "jSerialComm" } junit = { group = "junit", name = "junit", version.ref = "junit" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" } @@ -91,5 +81,5 @@ test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.27.0" test-junit = "junit:junit:4.13.2" test-compose-junit = "androidx.compose.ui:ui-test-junit4:1.5.3" test-compose-manifest = "androidx.compose.ui:ui-test-manifest:1.5.3" -test-mockk = "io.mockk:mockk:1.13.8" +test-mockk = "io.mockk:mockk:1.13.7" test-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"