diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index b38f3dd4b..6eb15c384 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.4" + versionName = "1.3.5" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index e5e1c4f18..83ef30b71 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1256,7 +1256,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.3.4" +version = "1.3.5" dependencies = [ "android_log-sys", "backoff", @@ -1283,7 +1283,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.3.5" +version = "1.3.6" dependencies = [ "anyhow", "backoff", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index 8aa05ea03..2111ff527 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.4" +version = "1.3.5" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index 5b83c08ef..3c73f46a0 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.5" +version = "1.3.6" edition = "2021" [features] diff --git a/scripts/Makefile b/scripts/Makefile index 526d91c16..7d38c2005 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -18,15 +18,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.3.4 -current-android-version = 1.3.3 +current-apple-version = 1.3.5 +current-android-version = 1.3.4 current-gateway-version = 1.3.1 current-gui-version = 1.3.6 current-headless-version = 1.3.3 # Tracks the next version to release for each platform -next-apple-version = 1.3.5 -next-android-version = 1.3.4 +next-apple-version = 1.3.6 +next-android-version = 1.3.5 next-gateway-version = 1.3.2 next-gui-version = 1.3.7 next-headless-version = 1.3.4 diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index de051a48a..fe7bf9450 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.5; + MARKETING_VERSION = 1.3.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.3.5; + MARKETING_VERSION = 1.3.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.3.5; + MARKETING_VERSION = 1.3.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.3.5; + MARKETING_VERSION = 1.3.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.3.5; + MARKETING_VERSION = 1.3.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.3.5; + MARKETING_VERSION = 1.3.6; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index aa8747be9..f8cad18b1 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -5,9 +5,9 @@ export async function GET(_req: NextRequest) { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.3.4", + apple: "1.3.5", // mark:current-android-version - android: "1.3.3", + android: "1.3.4", // mark:current-gui-version gui: "1.3.6", // mark:current-headless-version diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index 316438729..9d4045339 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -11,12 +11,13 @@ export default function Android() { title="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. */} - + + Fixes a bug where non-wildcard DNS resources were not prioritised over wildcard ones (e.g. `app.example.com` vs `*.example.com`). - + Resetting the settings now resets the list of favorited Resources, diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 416506ceb..dd4654f9e 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -11,13 +11,13 @@ export default function Apple() { title="macOS / iOS" > {/* 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 a bug where non-wildcard DNS resources were not prioritised over wildcard ones (e.g. `app.example.com` vs `*.example.com`). - + Fixes an issue where some browsers may fail to route DNS Resources