diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 960e26f33..dff3a6d3f 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -56,7 +56,7 @@ android { targetSdk = 35 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.3.2" + versionName = "1.3.3" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f99928bdf..1e1d139b4 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1008,7 +1008,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.3.2" +version = "1.3.3" dependencies = [ "android_log-sys", "backoff", @@ -1035,7 +1035,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.3.1" +version = "1.3.2" dependencies = [ "anyhow", "backoff", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index 51dbfeddf..d5c55bde3 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.3.2" +version = "1.3.3" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index cd9fb26f9..98f84cb2f 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.3.1" +version = "1.3.2" edition = "2021" [features] diff --git a/scripts/Makefile b/scripts/Makefile index 6a9210228..35834b517 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -2,26 +2,31 @@ # See discussion here: https://github.com/firezone/firezone/issues/2041 # and PR changing it here: https://github.com/firezone/firezone/pull/2949 -# Release Instructions: +# Release Instructions (Gateway/GUI/Headless) # 1. Publish the appropriate drafted release on GitHub # 2. Bump the appropriate version in this file # 3. Run `make version` # 4. Commit the changes # 5. Open a PR with the changes # +# Release Instructions (Apple/Android) +# 1. Run the Swift or Kotlin workflow on main. This will push a build to AppStore Connect or Firebase. +# 2. Create a new release in AppStore Connect or Firebase appropriately and submit. +# 3. When the release is approved and live, bump the appropriate version in this file. +# # CI will prevent pushing assets to releases that are published, so you need to bump # 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.3.0 -current-android-version = 1.3.1 +current-apple-version = 1.3.1 +current-android-version = 1.3.2 current-gateway-version = 1.3.1 current-gui-version = 1.3.2 current-headless-version = 1.3.1 # Tracks the next version to release for each platform -next-apple-version = 1.3.1 -next-android-version = 1.3.2 +next-apple-version = 1.3.2 +next-android-version = 1.3.3 next-gateway-version = 1.3.2 next-gui-version = 1.3.3 next-headless-version = 1.3.2 diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index 188164d22..c6244128b 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.3.1; + MARKETING_VERSION = 1.3.2; 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.3.1; + MARKETING_VERSION = 1.3.2; 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.3.1; + MARKETING_VERSION = 1.3.2; 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.3.1; + MARKETING_VERSION = 1.3.2; 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.3.1; + MARKETING_VERSION = 1.3.2; 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.3.1; + MARKETING_VERSION = 1.3.2; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index cc2175bff..97d48d083 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -9,11 +9,11 @@ export default function Android() { href="https://play.google.com/store/apps/details?id=dev.firezone.android" title="Android" > - {/* - */}