diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index a1d7665..7ddd286 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,7 +1,9 @@
name: CI
on:
pull_request:
- branches: [ main ]
+ branches:
+ - main
+ - alpha
push:
permissions:
contents: write
@@ -220,7 +222,7 @@ jobs:
draft-release:
runs-on: ubuntu-latest
needs: [ build ]
- if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+ if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/alpha')
steps:
- name: Checkout Project
uses: actions/checkout@v4
@@ -236,3 +238,4 @@ jobs:
tag: "${{ needs.build.outputs.bundle_short_version }}.${{ needs.build.outputs.bundle_version }}"
name: "v${{ needs.build.outputs.bundle_short_version }}.${{ needs.build.outputs.bundle_version }}"
version: "${{ needs.build.outputs.bundle_short_version }}.${{ needs.build.outputs.bundle_version }}"
+ prerelease: "${{ github.ref != 'refs/heads/main' }}"
diff --git a/Common/IpcMessages.swift b/Common/IpcMessages.swift
index 0861dd3..37d816e 100644
--- a/Common/IpcMessages.swift
+++ b/Common/IpcMessages.swift
@@ -264,9 +264,9 @@ class IpcSetEnabledMessage : IpcMessage {
class IpcSetEnabledResponseMessage : IpcMessage {
enum CodingKeys: String, CodingKey { case code }
- var code:Int32?
+ var code:Int64?
- init(_ zid:String, _ code:Int32) {
+ init(_ zid:String, _ code:Int64) {
let m = Meta(zid, .SetEnabledResponse)
self.code = code
super.init(m)
@@ -274,7 +274,7 @@ class IpcSetEnabledResponseMessage : IpcMessage {
required init(from decoder: Decoder) throws {
try super.init(from: decoder)
let c = try decoder.container(keyedBy: CodingKeys.self)
- code = try? c.decode(Int32.self, forKey: .code)
+ code = try? c.decode(Int64.self, forKey: .code)
}
override func encode(to encoder: Encoder) throws {
try super.encode(to: encoder)
diff --git a/Common/TunnelMgr.swift b/Common/TunnelMgr.swift
index 4ecb576..8dfde9c 100644
--- a/Common/TunnelMgr.swift
+++ b/Common/TunnelMgr.swift
@@ -297,7 +297,7 @@ class TunnelMgr: NSObject {
}
}
- func sendEnabledMessage(_ zid:ZitiIdentity, _ completionHandler: @escaping (Int32) -> Void) {
+ func sendEnabledMessage(_ zid:ZitiIdentity, _ completionHandler: @escaping (Int64) -> Void) {
guard self.status == .connected else {
completionHandler(0)
return
diff --git a/MobilePacketTunnelProvider/Info.plist b/MobilePacketTunnelProvider/Info.plist
index a445be9..336633c 100644
--- a/MobilePacketTunnelProvider/Info.plist
+++ b/MobilePacketTunnelProvider/Info.plist
@@ -23,7 +23,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 2.42
+ 2.43
CFBundleVersion
0
NSExtension
diff --git a/MobileShare/Info.plist b/MobileShare/Info.plist
index 5a7742f..99abd52 100644
--- a/MobileShare/Info.plist
+++ b/MobileShare/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
$(PRODUCT_BUNDLE_PACKAGE_TYPE)
CFBundleShortVersionString
- 2.42
+ 2.43
CFBundleVersion
0
NSExtension
diff --git a/Network/ZitiTunnelDelegate.swift b/Network/ZitiTunnelDelegate.swift
index 4318131..5c8efb5 100644
--- a/Network/ZitiTunnelDelegate.swift
+++ b/Network/ZitiTunnelDelegate.swift
@@ -516,14 +516,14 @@ class ZitiTunnelDelegate: NSObject, CZiti.ZitiTunnelProvider {
}
// find the lowest MFA timeout set for this identity (if any)
- var lowestTimeRemaining:Int32 = Int32.max
+ var lowestTimeRemaining:Int64 = Int64.max
tzid.services.forEach { svc in
svc.postureQuerySets?.forEach{ pqs in
if pqs.isPassing ?? true {
pqs.postureQueries?.forEach{ pq in
if let qt = pq.queryType, qt == "MFA", let tr = pq.timeoutRemaining, tr > 0, let lua = svc.status?.lastUpdatedAt {
let lastUpdatedAt = Date(timeIntervalSince1970: lua)
- let timeSinceLastUpdate = Int32(now.timeIntervalSince(lastUpdatedAt))
+ let timeSinceLastUpdate = Int64(now.timeIntervalSince(lastUpdatedAt))
let actualTimeRemaining = tr - timeSinceLastUpdate
if actualTimeRemaining < lowestTimeRemaining {
lowestTimeRemaining = actualTimeRemaining
diff --git a/PacketTunnelProvider/Info.plist b/PacketTunnelProvider/Info.plist
index 412f305..89590a5 100644
--- a/PacketTunnelProvider/Info.plist
+++ b/PacketTunnelProvider/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 2.42
+ 2.43
CFBundleVersion
0
LSMinimumSystemVersion
diff --git a/ZitiMobilePacketTunnel/Info.plist b/ZitiMobilePacketTunnel/Info.plist
index 853127a..60e4080 100644
--- a/ZitiMobilePacketTunnel/Info.plist
+++ b/ZitiMobilePacketTunnel/Info.plist
@@ -56,7 +56,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.42
+ 2.43
CFBundleVersion
0
LSRequiresIPhoneOS
diff --git a/ZitiPacketTunnel.xcodeproj/project.pbxproj b/ZitiPacketTunnel.xcodeproj/project.pbxproj
index 0087730..b281ab6 100644
--- a/ZitiPacketTunnel.xcodeproj/project.pbxproj
+++ b/ZitiPacketTunnel.xcodeproj/project.pbxproj
@@ -353,6 +353,7 @@
5A02AAAB206EBD7E006261C6 = {
isa = PBXGroup;
children = (
+ AA2098A62C57CC8800BCD073 /* Packages */,
5AF51049258246E60092DC47 /* Configs */,
5AF9C24B226B6FAC009CFD71 /* Default-568h@2x.png */,
5A8702D722372E7800314199 /* Common */,
@@ -544,6 +545,13 @@
path = simdata;
sourceTree = "";
};
+ AA2098A62C57CC8800BCD073 /* Packages */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = Packages;
+ sourceTree = "";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -1494,7 +1502,7 @@
repositoryURL = "https://github.com/openziti/ziti-sdk-swift-dist.git";
requirement = {
kind = upToNextMajorVersion;
- minimumVersion = 0.30.9;
+ minimumVersion = 0.40.1;
};
};
/* End XCRemoteSwiftPackageReference section */
diff --git a/ZitiPacketTunnel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ZitiPacketTunnel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index cecb8d1..288c82a 100644
--- a/ZitiPacketTunnel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ZitiPacketTunnel.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/openziti/ziti-sdk-swift-dist.git",
"state" : {
- "revision" : "71ad213d745bf1e2079d7fe58423c28cde5ad413",
- "version" : "0.30.35"
+ "revision" : "8c86e2a5383870daa68d84afbe2fff4aece84fd7",
+ "version" : "0.40.1"
}
}
],
diff --git a/ZitiPacketTunnel/Info.plist b/ZitiPacketTunnel/Info.plist
index 6d468c8..705d903 100644
--- a/ZitiPacketTunnel/Info.plist
+++ b/ZitiPacketTunnel/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.42
+ 2.43
CFBundleVersion
0
LSApplicationCategoryType