From 7e231c6b10848774de9449e11114a31c2c113965 Mon Sep 17 00:00:00 2001 From: Jamil Date: Wed, 29 Jan 2025 00:29:15 +0000 Subject: [PATCH] chore: Release Android 1.4.1 (#7911) --- .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 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index 129a30dc9..0a0f93a77 100644 --- a/.github/workflows/_kotlin.yml +++ b/.github/workflows/_kotlin.yml @@ -67,7 +67,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # mark:next-android-version - RELEASE_NAME: android-client-1.4.1 + RELEASE_NAME: android-client-1.4.2 run: | export ARTIFACT_PATH="$RUNNER_TEMP/firezone-${RELEASE_NAME}.${{ matrix.package-type }}" cp "${{ matrix.output-path }}" "$ARTIFACT_PATH" @@ -88,7 +88,7 @@ jobs: runs-on: ubuntu-22.04 env: # mark:next-android-version - RELEASE_NAME: android-client-1.4.1 + RELEASE_NAME: android-client-1.4.2 steps: - uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 # v6.0.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 5a61afaf7..4ad052f48 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.1" + versionName = "1.4.2" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 2ec1652b1..4b7e6846d 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1037,7 +1037,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.4.1" +version = "1.4.2" dependencies = [ "android_log-sys", "anyhow", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index 4569911f8..ebd38e304 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.1" +version = "1.4.2" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 204fdcd0e..696a08428 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.0" - next_android_version="1.4.1" + current_android_version="1.4.1" + next_android_version="1.4.2" 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 595f8b002..466775ddb 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.0/firezone-android-client-1.4.0.apk", + "https://www.github.com/firezone/firezone/releases/download/android-client-1.4.1/firezone-android-client-1.4.1.apk", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 987ed807d..72c591fe0 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.0", // mark:current-android-version - android: "1.4.0", + android: "1.4.1", // mark:current-gui-version gui: "1.4.1", // mark:current-headless-version