fix: ci versionCode

Change release pipeline to deploy to production google play

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+ko_fi: zaneschepke
+liberapay: zaneschepke

.github/workflows/pre-release.yml

@@ -1,10 +1,11 @@
 # name of the workflow
-name: Android CI Tag Deployment
+name: Android CI Tag Deployment (Pre-release)
 
 on:
+  workflow_dispatch:
   push:
     tags:
-      - '*.*.*'
+      - '*.*.*-**'
 
 jobs:
   build:
@@ -52,10 +53,13 @@ jobs:
       - name: Get apk path
         id: apk-path
         run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-
+      - name: Get version code
+        run: |
+          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
+          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
       # Save the APK after the Build job is complete to publish it as a Github release in the next job
       - name: Upload APK
-        uses: actions/upload-artifact@v4.0.0
+        uses: actions/upload-artifact@v4.2.0
         with:
           name: wgtunnel
           path: ${{ steps.apk-path.outputs.path }}
@@ -70,18 +74,17 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           # fix hardcode changelog file name
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/33300.txt
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
           tag_name: ${{ github.ref_name }}
-          name: Release ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
           draft: false
-          prerelease: false
+          prerelease: true
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true
-
       - name: Distribute app to Beta track 🚀
         run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
 

.github/workflows/release.yml

@@ -0,0 +1,97 @@
+# name of the workflow
+name: Android CI Tag Deployment (Release)
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '*.*.*'
+      - '!*.*.*-**'
+
+jobs:
+  build:
+    name: Build Signed APK
+
+    runs-on: ubuntu-latest
+
+    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 }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # Here we need to decode keystore.jks from base64 string and place it
+      # in the folder specified in the release signing configuration
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: 'android_keystore.jks'
+          fileDir: ${{ github.workspace }}/app/keystore/
+          encodedString: ${{ secrets.KEYSTORE }}
+
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+
+      # Build and sign APK ("-x test" argument is used to skip tests)
+      # add fdroid flavor for apk upload
+      - name: Build Fdroid Release APK
+        run: ./gradlew :app:assembleFdroidRelease -x test
+
+      # get fdroid flavor release apk path
+      - name: Get apk path
+        id: apk-path
+        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
+      - name: Get version code
+        run: |
+          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
+          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+      # Save the APK after the Build job is complete to publish it as a Github release in the next job
+      - name: Upload APK
+        uses: actions/upload-artifact@v4.2.0
+        with:
+          name: wgtunnel
+          path: ${{ steps.apk-path.outputs.path }}
+      - name: Download APK from build
+        uses: actions/download-artifact@v4
+        with:
+          name: wgtunnel
+      - name: Repository Dispatch for my F-Droid repo
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.PAT }}
+          repository: zaneschepke/fdroid
+          event-type: fdroid-update
+      - name: Create Release with Fastlane changelog notes
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # fix hardcode changelog file name
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
+      - name: Deploy with fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2' # Not needed with a .ruby-version file
+          bundler-cache: true
+      - name: Distribute app to Beta track 🚀
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane production)
+

README.md

@@ -17,12 +17,6 @@ WG Tunnel
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 
 
-</div>
-
-<div align="center">
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8NMJN2)
-
 </div>
 
 
@@ -67,6 +61,12 @@ and on while on different networks. This app was created to offer a free solutio
 * Automatic service restart after reboot
 * Battery preservation measures
 
+## Docs (WIP)
+
+Basic documentation of the feature and behaviors of this app can be found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
+
+The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).
+
 ## Building
 
 ```

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigViewModel.kt

@@ -206,11 +206,13 @@ constructor(
             val peerList = buildPeerListFromProxyPeers()
             val wgInterface = buildInterfaceListFromProxyInterface()
             val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
-            val tunnelConfig =
-                _uiState.value.tunnel?.copy(
+            val tunnelConfig = when(uiState.value.tunnel) {
+                null -> TunnelConfig(name = _uiState.value.tunnelName, wgQuick = config.toWgQuickString())
+                else -> uiState.value.tunnel!!.copy(
                     name = _uiState.value.tunnelName,
                     wgQuick = config.toWgQuickString(),
                 )
+            }
             updateTunnelConfig(tunnelConfig)
             Result.Success(Event.Message.ConfigSaved)
         } catch (e: Exception) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt

@@ -69,11 +69,6 @@ fun WireguardAutoTunnelTheme(
             window.navigationBarColor = Color.Transparent.toArgb()
             WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
                 !darkTheme
-            WindowCompat.getInsetsController(
-                    window,
-                    window.decorView,
-                )
-                .isAppearanceLightNavigationBars = !darkTheme
         }
     }
 

buildSrc/src/main/kotlin/Constants.kt

@@ -1,12 +1,12 @@
 object Constants {
-    const val VERSION_NAME = "3.3.3"
+    const val VERSION_NAME = "3.3.4-test1"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 33300
+    const val VERSION_CODE = 33401
     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.7"
+    const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.8"
 
 
     const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD"

fastlane/Fastfile

@@ -2,6 +2,18 @@ default_platform(:android)
 
 platform :android do
 
+  desc 'Deploy a new internal version to the Google Play Store'
+  lane :internal do
+    gradle(task: "clean bundleGeneralRelease")
+    upload_to_play_store(track: 'internal', skip_upload_apk: true)
+  end
+
+  desc "Deploy an alpha version to the Google Play"
+    lane :alpha do
+      gradle(task: "clean bundleGeneralRelease")
+      upload_to_play_store(track: 'alpha', skip_upload_apk: true)
+  end
+
   desc "Deploy a beta version to the Google Play"
   lane :beta do
     gradle(task: "clean bundleGeneralRelease")

fastlane/metadata/android/en-US/changelogs/33400.txt

@@ -0,0 +1,3 @@
+Enhancements:
+- Fixed create config not saving
+- Bumped versions

fastlane/metadata/android/en-US/changelogs/33401.txt

@@ -0,0 +1,2 @@
+What's new:
+- This is a CI testing version

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ hiltAndroid = "2.50"
 hiltNavigationCompose = "1.1.0"
 junit = "4.13.2"
 kotlinx-serialization-json = "1.6.2"
-lifecycle-runtime-compose = "2.6.2"
+lifecycle-runtime-compose = "2.7.0"
 material-icons-extended = "1.5.4"
 material3 = "1.1.2"
 navigationCompose = "2.7.6"
@@ -23,8 +23,8 @@ roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.0.20230706"
 androidGradlePlugin = "8.2.1"
-kotlin = "1.9.21"
-ksp = "1.9.21-1.0.16"
+kotlin = "1.9.22"
+ksp = "1.9.22-1.0.16"
 composeBom = "2023.10.01"
 firebaseBom = "32.7.0"
 compose = "1.5.4"