From a47b96bcad858dcdf5e37f4869ba474905f26476 Mon Sep 17 00:00:00 2001 From: Jamil Date: Sat, 15 Mar 2025 17:13:17 -0500 Subject: [PATCH] chore: Release android 1.4.4 (#8449) This was already published on Google Play, but the other clients will follow suit in #8442. --- .github/workflows/_kotlin.yml | 4 ++-- kotlin/android/app/build.gradle.kts | 2 +- rust/Cargo.lock | 2 +- rust/connlib/clients/android/Cargo.toml | 2 +- scripts/bump-versions.sh | 4 ++-- website/redirects.js | 2 +- website/src/app/api/releases/route.ts | 2 +- website/src/components/Changelog/Android.tsx | 5 +++++ 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index 8e43a2f88..47ec1440f 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.4.4 + RELEASE_NAME: android-client-1.4.5 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -99,7 +99,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # mark:next-android-version - RELEASE_NAME: android-client-1.4.4 + RELEASE_NAME: android-client-1.4.5 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 5897ed967..af876cb12 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -53,7 +53,7 @@ android { targetSdk = 35 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.4.4" + versionName = "1.4.5" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f7a578b6b..b14e28577 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1037,7 +1037,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.4.4" +version = "1.4.5" dependencies = [ "android_log-sys", "anyhow", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index d10c504e9..5acf1aab3 100644 --- a/rust/connlib/clients/android/Cargo.toml +++ b/rust/connlib/clients/android/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-android" # mark:next-android-version -version = "1.4.4" +version = "1.4.5" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index f1bb5f445..129105c8e 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -82,8 +82,8 @@ function apple() { # 7. Commit the changes and open a PR. Ensure the Changelog is correctly # updated with the changes. function android() { - current_android_version="1.4.3" - next_android_version="1.4.4" + current_android_version="1.4.4" + next_android_version="1.4.5" 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_version}"'/g;}' {} \; find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_android_version}"'/g;}' {} \; diff --git a/website/redirects.js b/website/redirects.js index 2c5a80d32..3ec518a3b 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -22,7 +22,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.4.3/firezone-android-client-1.4.3.apk", + "https://www.github.com/firezone/firezone/releases/download/android-client-1.4.4/firezone-android-client-1.4.4.apk", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index df570fb19..5941c0db6 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.4.6", // mark:current-android-version - android: "1.4.3", + android: "1.4.4", // mark:current-gui-version gui: "1.4.8", // mark:current-headless-version diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index d3483a1ef..cb722dbaa 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -20,6 +20,11 @@ export default function Android() { {/* 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. */} + + + Adds support for search domains configured in the admin portal. + + Fixes a bug where UI controls could overlap with system controls on