From c0cff297b2ec31e6258f9a518b706464fa5c26dc Mon Sep 17 00:00:00 2001 From: Zane Schepke Date: Mon, 11 Mar 2024 12:39:00 -0400 Subject: [PATCH] remove firebase --- app/build.gradle.kts | 10 +---- app/google-services.json | 39 ------------------- app/src/main/AndroidManifest.xml | 12 +++--- .../ui/screens/main/MainScreen.kt | 1 - build.gradle.kts | 11 +----- buildSrc/src/main/kotlin/Constants.kt | 6 +-- gradle/libs.versions.toml | 29 ++++++-------- settings.gradle.kts | 4 +- 8 files changed, 24 insertions(+), 88 deletions(-) delete mode 100644 app/google-services.json diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 04eaa6b..bc1289a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.hilt.android) - id("org.jetbrains.kotlin.plugin.serialization") + alias(libs.plugins.kotlinxSerialization) alias(libs.plugins.ksp) } @@ -111,8 +111,7 @@ android { create("general") { dimension = Constants.TYPE if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) { - apply(plugin = "com.google.gms.google-services") - apply(plugin = "com.google.firebase.crashlytics") + //any plugins general specific } } } @@ -193,11 +192,6 @@ dependencies { // serialization implementation(libs.kotlinx.serialization.json) - // firebase crashlytics - generalImplementation(platform(libs.firebase.bom)) - generalImplementation(libs.google.firebase.crashlytics.ktx) - generalImplementation(libs.google.firebase.analytics.ktx) - // barcode scanning implementation(libs.zxing.android.embedded) implementation(libs.zxing.core) diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index 0ac748c..0000000 --- a/app/google-services.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "project_info": { - "project_number": "328300975830", - "project_id": "wireguard-auto-tunnel", - "storage_bucket": "wireguard-auto-tunnel.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:328300975830:android:82cd774598ccb7234b1b77", - "android_client_info": { - "package_name": "com.zaneschepke.wireguardautotunnel" - } - }, - "oauth_client": [ - { - "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBsSMY0LlckizXDnuYBy7nXWGSdl8zZedI" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f4f2093..aa70b78 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ - - @@ -84,7 +82,8 @@ android:screenOrientation="fullSensor" android:stateNotNeeded="true" android:theme="@style/zxing_CaptureTheme" - android:windowSoftInputMode="stateAlwaysHidden" /> + android:windowSoftInputMode="stateAlwaysHidden" + tools:ignore="DiscouragedApi" /> @@ -134,7 +133,7 @@ android:name=".service.foreground.WireGuardConnectivityWatcherService" android:enabled="true" android:exported="false" - android:foregroundServiceType="systemExempted|specialUse" + android:foregroundServiceType="systemExempted" android:persistent="true" android:stopWithTask="false" tools:node="merge" /> @@ -145,7 +144,6 @@ android:exported="false"> - diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt index 8378bad..a73f546 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt @@ -13,7 +13,6 @@ import androidx.compose.animation.fadeOut import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.focusable import androidx.compose.foundation.gestures.ScrollableDefaults diff --git a/build.gradle.kts b/build.gradle.kts index 20ac053..e28deac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,7 @@ -buildscript { - dependencies { - if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) { - classpath(libs.google.services) - classpath(libs.firebase.crashlytics.gradle) - } - } -} - plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.hilt.android) apply false - kotlin("plugin.serialization").version(libs.versions.kotlin).apply(false) + alias(libs.plugins.kotlinxSerialization) apply false alias(libs.plugins.ksp) apply false } diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index 4656e2d..495ae81 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -1,12 +1,12 @@ object Constants { - const val VERSION_NAME = "3.3.8" + const val VERSION_NAME = "3.3.8-ipv6" const val JVM_TARGET = "17" - const val VERSION_CODE = 33800 + const val VERSION_CODE = 33803 const val TARGET_SDK = 34 const val MIN_SDK = 26 const val APP_ID = "com.zaneschepke.wireguardautotunnel" const val APP_NAME = "wgtunnel" - const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.8" + const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.10" const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0fbac8e..c663c9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,10 +9,8 @@ coreKtx = "1.12.0" datastorePreferences = "1.0.0" desugar_jdk_libs = "2.0.4" espressoCore = "3.5.1" -firebase-crashlytics-gradle = "2.9.9" -google-services = "4.4.1" hiltAndroid = "2.50" -hiltNavigationCompose = "1.1.0" +hiltNavigationCompose = "1.2.0" junit = "4.13.2" kotlinx-serialization-json = "1.6.3" lifecycle-runtime-compose = "2.7.0" @@ -21,17 +19,17 @@ navigationCompose = "2.7.7" roomVersion = "2.6.1" timber = "5.0.1" tunnel = "1.1.0" -androidGradlePlugin = "8.3.0-rc02" +androidGradlePlugin = "8.3.0" kotlin = "1.9.22" -ksp = "1.9.22-1.0.16" -composeBom = "2024.02.00" -firebaseBom = "32.7.2" -compose = "1.6.1" -crashlytics = "18.6.2" -analytics = "21.5.1" +ksp = "1.9.22-1.0.17" +composeBom = "2024.02.01" +compose = "1.6.3" zxingAndroidEmbedded = "4.3.0" zxingCore = "3.5.3" +#plugins +gradlePlugins-kotlinxSerialization = "1.8.21" + [libraries] @@ -84,17 +82,12 @@ material-icons-extended = { module = "androidx.compose.material:material-icons-e timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } tunnel = { module = "com.zaneschepke:wireguard-android", version.ref = "tunnel" } -#firebase -google-firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx", version.ref = "crashlytics" } -google-firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "analytics" } -firebase-crashlytics-gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebase-crashlytics-gradle" } -firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" } -google-services = { module = "com.google.gms:google-services", version.ref = "google-services" } - zxing-core = { module = "com.google.zxing:core", version.ref = "zxingCore" } zxing-android-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxingAndroidEmbedded" } + [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "gradlePlugins-kotlinxSerialization" } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index a29e22c..3678f76 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,8 @@ pluginManagement { repositories { + mavenLocal() google() mavenCentral() - mavenLocal() gradlePluginPortal() } } @@ -13,6 +13,7 @@ val GITHUB_TOKEN_VAR = "GH_TOKEN" dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + mavenLocal() maven { name = "GitHubPackages" url = uri("https://maven.pkg.github.com/zaneschepke/wireguard-android") @@ -23,7 +24,6 @@ dependencyResolutionManagement { } google() mavenCentral() - mavenLocal() } }