zaneschepke
/
wgtunnel
mirror of https://github.com/zaneschepke/wgtunnel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: build warnings and deprecations

This commit is contained in:
Zane Schepke 2023-11-08 22:39:51 -05:00
parent 0a17593310
commit eb7b39c379
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/android.yml vendored
View File

@ -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:

6
app/build.gradle.kts
View File

@ -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

10
app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/MainActivity.kt
View File

@ -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 ->

1
gradle/libs.versions.toml
View File

@ -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" }