github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: bump android apple dns match (#6833)

Browse Source 
Bumps Android -> 1.3.4, Apple -> 1.3.5

---------

Signed-off-by: Jamil <jamilbk@users.noreply.github.com>
This commit is contained in:
Jamil
2024-09-26 09:32:41 -07:00
committed by GitHub
parent d6128db353
commit e7dddee78f
9 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin/android/app/build.gradle.kts
View File

@@ -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"

4
rust/Cargo.lock generated
View File

@@ -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",

2
rust/connlib/clients/android/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-android"
# mark:next-android-version
version = "1.3.4"
version = "1.3.5"
edition = "2021"
[lib]

2
rust/connlib/clients/apple/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-apple"
# mark:next-apple-version
version = "1.3.5"
version = "1.3.6"
edition = "2021"
[features]

8
scripts/Makefile
View File

@@ -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

12
swift/apple/Firezone.xcodeproj/project.pbxproj
View File

@@ -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)";

4
website/src/app/api/releases/route.ts
View File

@@ -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

5
website/src/components/Changelog/Android.tsx
View File

@@ -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. */}
<Unreleased>
<Unreleased></Unreleased>
<Entry version="1.3.4" date={new Date("2024-09-26")}>
<ChangeItem pull="6809">
Fixes a bug where non-wildcard DNS resources were not prioritised over
wildcard ones (e.g. `app.example.com` vs `*.example.com`).
</ChangeItem>
</Unreleased>
</Entry>
<Entry version="1.3.3" date={new Date("2024-09-24")}>
<ChangeItem pull="6707">
Resetting the settings now resets the list of favorited Resources,

6
website/src/components/Changelog/Apple.tsx
View File

@@ -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. */}
<Unreleased>
<Unreleased></Unreleased>
<Entry version="1.3.5" date={new Date("2024-09-26")}>
<ChangeItem pull="6809">
Fixes a bug where non-wildcard DNS resources were not prioritised over
wildcard ones (e.g. `app.example.com` vs `*.example.com`).
</ChangeItem>
</Unreleased>
</Entry>
<Entry version="1.3.4" date={new Date("2024-09-25")}>
<ChangeItem pull="6788">
Fixes an issue where some browsers may fail to route DNS Resources