From eda1df56c2f7163ebee777981b60a8b070f0e7a0 Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 17 Jun 2024 06:55:33 -0700 Subject: [PATCH] ci: Bump Android/Apple cur versions to 1.0.4/1.0.5 (#5397) --- .github/workflows/_kotlin.yml | 2 +- .github/workflows/_swift.yml | 2 +- kotlin/android/app/build.gradle.kts | 2 +- rust/Cargo.lock | 4 ++-- rust/connlib/clients/android/Cargo.toml | 2 +- rust/connlib/clients/apple/Cargo.toml | 2 +- scripts/Makefile | 8 ++++---- swift/apple/Firezone.xcodeproj/project.pbxproj | 12 ++++++------ 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index 6c706a12e..4a67d07f8 100644 --- a/.github/workflows/_kotlin.yml +++ b/.github/workflows/_kotlin.yml @@ -51,7 +51,7 @@ jobs: - name: Bundle and sign release env: # mark:next-android-version - FIREZONE_PACKAGE_VERSION: 1.0.4 + FIREZONE_PACKAGE_VERSION: 1.0.5 KEYSTORE_BASE64: ${{ secrets.GOOGLE_UPLOAD_KEYSTORE_BASE64 }} KEYSTORE_PASSWORD: ${{ secrets.GOOGLE_UPLOAD_KEYSTORE_PASSWORD }} KEYSTORE_KEY_PASSWORD: ${{ secrets.GOOGLE_UPLOAD_KEYSTORE_KEY_PASSWORD }} diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index ec2a83b6c..7b5c002c3 100644 --- a/.github/workflows/_swift.yml +++ b/.github/workflows/_swift.yml @@ -96,7 +96,7 @@ jobs: # Needed because `productbuild` doesn't support picking this up automatically like Xcode does INSTALLER_CODE_SIGN_IDENTITY: "3rd Party Mac Developer Installer: Firezone, Inc. (47R2M6779T)" # mark:next-apple-version - FIREZONE_PACKAGE_VERSION: 1.0.5 + FIREZONE_PACKAGE_VERSION: 1.0.6 run: | # Use the same Xcode version as development sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 7590661f5..901e3d77a 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -56,7 +56,7 @@ android { targetSdk = 34 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.0.4" + versionName = "1.0.5" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index aa5d60bfc..ecbbda3e5 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1105,7 +1105,7 @@ dependencies = [ [[package]] name = "connlib-client-android" -version = "1.0.4" +version = "1.0.5" dependencies = [ "connlib-client-shared", "ip_network", @@ -1124,7 +1124,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.0.5" +version = "1.0.6" dependencies = [ "connlib-client-shared", "ip_network", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index 1a33c7a10..fffa3aa80 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.0.4" +version = "1.0.5" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index e339824d7..f95010784 100644 --- a/rust/connlib/clients/apple/Cargo.toml +++ b/rust/connlib/clients/apple/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-apple" # mark:next-apple-version -version = "1.0.5" +version = "1.0.6" edition = "2021" [features] diff --git a/scripts/Makefile b/scripts/Makefile index 06c155d62..d8ed4db27 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -13,15 +13,15 @@ # the relevant versions in order to push to a newly drafted release. # Tracks the current version to use for generating download links and changelogs -current-apple-version = 1.0.4 -current-android-version = 1.0.3 +current-apple-version = 1.0.5 +current-android-version = 1.0.4 current-gateway-version = 1.0.7 current-gui-version = 1.0.7 current-headless-version = 1.0.7 # Tracks the next version to release for each platform -next-apple-version = 1.0.5 -next-android-version = 1.0.4 +next-apple-version = 1.0.6 +next-android-version = 1.0.5 next-gateway-version = 1.0.8 next-gui-version = 1.0.8 next-headless-version = 1.0.8 diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index cc6c1776f..20d8c3165 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -585,7 +585,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension"; @@ -627,7 +627,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -671,7 +671,7 @@ "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/debug"; "LIBRARY_SEARCH_PATHS[arch=arm64e]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/debug"; "LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(CONNLIB_TARGET_DIR)/x86_64-apple-darwin/debug"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -714,7 +714,7 @@ "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/release"; "LIBRARY_SEARCH_PATHS[arch=arm64e]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/release"; "LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(CONNLIB_TARGET_DIR)/x86_64-apple-darwin/release"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -908,7 +908,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -959,7 +959,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME)";