From eb7b39c3790723137a62955fbbeb87521e3bc99b Mon Sep 17 00:00:00 2001
From: Zane Schepke <zanecschepke@gmail.com>
Date: Wed, 8 Nov 2023 22:39:51 -0500
Subject: [PATCH] fix: build warnings and deprecations

---
 .github/workflows/android.yml                          |  6 ++++--
 app/build.gradle.kts                                   |  6 ++++--
 .../zaneschepke/wireguardautotunnel/ui/MainActivity.kt | 10 +++++-----
 gradle/libs.versions.toml                              |  1 -
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 9fd8e4f5..9a470cb9 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -37,6 +37,7 @@ jobs:
       - name: Build Fdroid Release APK
         run: ./gradlew :app:assembleFdroidRelease -x test
         env:
+          KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
           SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
           SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
@@ -51,6 +52,7 @@ jobs:
         id: buildRelease
         run: ./gradlew bundleGeneralRelease
         env:
+          KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
           SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
           SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
@@ -69,11 +71,11 @@ jobs:
       # upload general flavor release aab to beta track
       - name: Publish to Play Store BETA
         id: publish
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@v1.1.2
         with:
           serviceAccountJson: service_account.json
           packageName: com.zaneschepke.wireguardautotunnel
-          releaseFile: app/build/outputs/bundle/generalRelease/app-general-release.aab
+          releaseFiles: app/build/outputs/bundle/generalRelease/app-general-release.aab
           track: beta
 
   release:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a288032a..0036c7be 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -41,7 +41,7 @@ android {
                     load(file("signing_template.properties").reader())
                 }
             }
-            val storePassVarName = "SIGNING_STORE_PASSWORD";
+            val storePassVarName = "SIGNING_STORE_PASSWORD"
             val keyAliasVarName = "SIGNING_KEY_ALIAS"
             val keyPassVarName = "SIGNING_KEY_PASSWORD"
             val keyStorePathVarName = "KEY_STORE_PATH"
@@ -55,6 +55,9 @@ android {
     }
 
     buildTypes {
+        //don't strip
+        packaging.jniLibs.keepDebugSymbols.addAll(listOf("libwg-go.so", "libwg-quick.so", "libwg.so"))
+
         applicationVariants.all {
             val variant = this
             variant.outputs
@@ -158,7 +161,6 @@ dependencies {
     implementation(libs.accompanist.systemuicontroller)
     implementation(libs.accompanist.permissions)
     implementation(libs.accompanist.flowlayout)
-    implementation(libs.accompanist.navigation.animation)
     implementation(libs.accompanist.drawablepainter)
 
     //room
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/MainActivity.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/MainActivity.kt
index 2b9e0c5a..7f58a99c 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/MainActivity.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/MainActivity.kt
@@ -34,9 +34,9 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -67,7 +67,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            val navController = rememberAnimatedNavController()
+            val navController = rememberNavController()
             val focusRequester = remember { FocusRequester() }
 
             WireguardAutoTunnelTheme {
@@ -172,7 +172,7 @@ class MainActivity : AppCompatActivity() {
                         return@Scaffold
                     }
 
-                    AnimatedNavHost(navController, startDestination = Routes.Main.name) {
+                    NavHost(navController, startDestination = Routes.Main.name) {
                         composable(Routes.Main.name, enterTransition = {
                             when (initialState.destination.route) {
                                 Routes.Settings.name, Routes.Support.name ->
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1cba9354..f83d5cc7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,6 @@ zxingCore = "3.5.2"
 # accompanist
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
-accompanist-navigation-animation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }