From e7f8a4e4bff0e8c322073aa2d69caa8e38799c65 Mon Sep 17 00:00:00 2001 From: Jamil Date: Sat, 10 Aug 2024 13:04:26 -0700 Subject: [PATCH] ci: bump apple / android versions (#6251) These were approved and published so the versions need bumping. --- 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 ++++++------ website/src/components/Changelog/Android.tsx | 12 +++++++++++- website/src/components/Changelog/Apple.tsx | 10 ++++++++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index bc1d7f82b..a524d1b65 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.1.5" + versionName = "1.1.6" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c49ab9f83..c55c632e6 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -990,7 +990,7 @@ dependencies = [ [[package]] name = "connlib-client-android" -version = "1.1.5" +version = "1.1.6" dependencies = [ "android_log-sys", "backoff", @@ -1016,7 +1016,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.1.4" +version = "1.1.5" dependencies = [ "anyhow", "backoff", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index afe7f1410..de24cb111 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.1.5" +version = "1.1.6" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index 4bebd8199..8058633ed 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.1.4" +version = "1.1.5" edition = "2021" [features] diff --git a/scripts/Makefile b/scripts/Makefile index 699ef2b06..93728766b 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.1.3 -current-android-version = 1.1.4 +current-apple-version = 1.1.4 +current-android-version = 1.1.5 current-gateway-version = 1.1.4 current-gui-version = 1.1.11 current-headless-version = 1.1.6 # Tracks the next version to release for each platform -next-apple-version = 1.1.4 -next-android-version = 1.1.5 +next-apple-version = 1.1.5 +next-android-version = 1.1.6 next-gateway-version = 1.1.5 next-gui-version = 1.1.12 next-headless-version = 1.1.7 diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index c2925c46d..94041e49d 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.1.4; + MARKETING_VERSION = 1.1.5; 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.1.4; + MARKETING_VERSION = 1.1.5; 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.1.4; + MARKETING_VERSION = 1.1.5; 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.1.4; + MARKETING_VERSION = 1.1.5; 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.1.4; + MARKETING_VERSION = 1.1.5; 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.1.4; + MARKETING_VERSION = 1.1.5; 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 35211e065..1c671737b 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -10,7 +10,7 @@ export default function Android() { title="Android" > {/* - +
    Adds the ability to mark Resources as favorites. @@ -21,6 +21,16 @@ export default function Android() {
*/} + +
    + + Adds the ability to mark Resources as favorites. + + + Improves reliability of DNS resolution of non-resources. + +
+
  • diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 2400d8e20..7f5a4df3b 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -1,6 +1,7 @@ import Link from "next/link"; import Entry from "./Entry"; import Entries from "./Entries"; +import ChangeItem from "./ChangeItem"; export default function Apple() { return ( @@ -8,13 +9,18 @@ export default function Apple() { href="https://apps.apple.com/us/app/firezone/id6443661826" title="macOS / iOS" > - {/* + {/* +
      + TODO +
    +     */} +
      Improves reliability of DNS resolution of non-resources.
    -     */} +