diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index c57617c49..cf3e46c18 100644 --- a/.github/workflows/_kotlin.yml +++ b/.github/workflows/_kotlin.yml @@ -28,7 +28,7 @@ jobs: contents: write # for updating the release draft env: # mark:next-android-version - RELEASE_NAME: android-client-1.5.2 + RELEASE_NAME: android-client-1.5.3 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -100,7 +100,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # mark:next-android-version - RELEASE_NAME: android-client-1.5.2 + RELEASE_NAME: android-client-1.5.3 run: | export ARTIFACT_PATH="$RUNNER_TEMP/firezone-${RELEASE_NAME}.${{ matrix.package-type }}" cp "${{ matrix.output-path }}" "$ARTIFACT_PATH" diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 230b0eeb0..5f0defef3 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -53,7 +53,7 @@ android { targetSdk = 36 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.5.2" + versionName = "1.5.3" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index bd085c774..b7f12c96f 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -126,8 +126,8 @@ function apple() { # 6. Run `scripts/bump-versions.sh android` to update the versions in the codebase. # 7. Commit the changes and open a PR. function android() { - current_android_client_version="1.5.1" - next_android_client_version="1.5.2" + current_android_client_version="1.5.2" + next_android_client_version="1.5.3" update_changelog "website/src/components/Changelog/Android.tsx" "$current_android_client_version" find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_android_client_version}"'/g;}' {} \; diff --git a/website/redirects.js b/website/redirects.js index 774e1eeae..6401e5e4a 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -29,7 +29,7 @@ module.exports = [ source: "/dl/firezone-client-android/latest", destination: // mark:current-android-version - "https://www.github.com/firezone/firezone/releases/download/android-client-1.5.1/firezone-android-client-1.5.1.apk", + "https://www.github.com/firezone/firezone/releases/download/android-client-1.5.2/firezone-android-client-1.5.2.apk", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index bfcb55d5a..dc325f668 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -7,7 +7,7 @@ export async function GET(_req: NextRequest) { // mark:current-apple-version apple: "1.5.3", // mark:current-android-version - android: "1.5.1", + android: "1.5.2", // mark:current-gui-version gui: "1.5.4", // mark:current-headless-version diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index 08d50cb58..e0c5b2ab8 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -20,7 +20,8 @@ export default function Android() { return ( {/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */} - + + Fixes an issue where the VPN permission screen wouldn't dismiss after granting the VPN permission. @@ -29,7 +30,7 @@ export default function Android() { Fixes an issue where connections would fail to establish if both Client and Gateway were behind symmetric NAT. - + Fixes a minor issue that would cause background service panic when