From 21d84a5b34738260aa80c22397e4d6d9af458f4b Mon Sep 17 00:00:00 2001 From: Mike Nachbaur Date: Wed, 31 Jul 2024 16:49:22 -0700 Subject: [PATCH 1/3] Fix "Multiple commands produce PrivacyInfo.xcprivacy" error --- OktaAuthNative.xcodeproj/project.pbxproj | 4 ++-- OktaAuthSdk.podspec | 4 ++-- Source/RestAPI/Utils.swift | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OktaAuthNative.xcodeproj/project.pbxproj b/OktaAuthNative.xcodeproj/project.pbxproj index c06aa28..8ff396b 100644 --- a/OktaAuthNative.xcodeproj/project.pbxproj +++ b/OktaAuthNative.xcodeproj/project.pbxproj @@ -836,7 +836,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 2.4.4; + MARKETING_VERSION = 2.4.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -912,7 +912,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 2.4.4; + MARKETING_VERSION = 2.4.6; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.okta.auth-swift"; diff --git a/OktaAuthSdk.podspec b/OktaAuthSdk.podspec index ae1450d..2f886f8 100644 --- a/OktaAuthSdk.podspec +++ b/OktaAuthSdk.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'OktaAuthSdk' - s.version = '2.4.5' + s.version = '2.4.6' s.summary = 'SDK for Okta native authentication.' s.description = <<-DESC Integrate your native app with Okta. @@ -14,7 +14,7 @@ Integrate your native app with Okta. s.ios.deployment_target = '10.0' s.osx.deployment_target = '10.14' s.source_files = 'Source/**/*' - s.resources = 'Source/Resources/**/*' + s.resource_bundles = { 'OktaAuthSdk' => 'Source/Resources/**/*' } s.swift_version = '5.0' s.exclude_files = [ 'Source/Info.plist' diff --git a/Source/RestAPI/Utils.swift b/Source/RestAPI/Utils.swift index d6bd3b5..d1dfba5 100644 --- a/Source/RestAPI/Utils.swift +++ b/Source/RestAPI/Utils.swift @@ -17,7 +17,7 @@ import UIKit #endif public func sdkVersion() -> String { - return "2.4.4" + return "2.4.6" } internal func buildUserAgent() -> String { From abc5e393bfd91ceb902b8d67611d97f725badd61 Mon Sep 17 00:00:00 2001 From: Mike Nachbaur Date: Thu, 1 Aug 2024 11:46:20 -0700 Subject: [PATCH 2/3] Update Github Actions macOS runner environment --- .github/workflows/okta-auth.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/okta-auth.yml b/.github/workflows/okta-auth.yml index 26d9f5d..10d5c5a 100644 --- a/.github/workflows/okta-auth.yml +++ b/.github/workflows/okta-auth.yml @@ -8,7 +8,9 @@ on: jobs: UnitTests: - runs-on: macos-11 + runs-on: macos-latest + env: + DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer steps: - uses: actions/checkout@v2 - name: iOS @@ -16,7 +18,9 @@ jobs: - name: Swift run: swift test -v PackageValidation: - runs-on: macos-11 + runs-on: macos-latest + env: + DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer steps: - uses: actions/checkout@v2 - name: Cocoapods From b8eba010199682bbf10fe2bd0db28dbe77be78d1 Mon Sep 17 00:00:00 2001 From: Mike Nachbaur Date: Thu, 1 Aug 2024 15:06:54 -0700 Subject: [PATCH 3/3] Update target simulator --- .github/workflows/okta-auth.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/okta-auth.yml b/.github/workflows/okta-auth.yml index 10d5c5a..3de40a8 100644 --- a/.github/workflows/okta-auth.yml +++ b/.github/workflows/okta-auth.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: iOS - run: xcodebuild -workspace OktaAuthSdk.xcworkspace -scheme "OktaAuthNative iOS" -destination "platform=iOS Simulator,OS=latest,name=iPhone 11" clean test + run: xcodebuild -workspace OktaAuthSdk.xcworkspace -scheme "OktaAuthNative iOS" -destination "platform=iOS Simulator,OS=latest,name=iPhone 15 Pro Max" clean test - name: Swift run: swift test -v PackageValidation: