Skip to content

Commit 8345ba3

Browse files
Fix "Multiple commands produce PrivacyInfo.xcprivacy" error (#166)
* Fix "Multiple commands produce PrivacyInfo.xcprivacy" error * Update Github Actions macOS runner environment * Update target simulator
1 parent e8fd454 commit 8345ba3

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.github/workflows/okta-auth.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@ on:
88

99
jobs:
1010
UnitTests:
11-
runs-on: macos-11
11+
runs-on: macos-latest
12+
env:
13+
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
1214
steps:
1315
- uses: actions/checkout@v2
1416
- name: iOS
15-
run: xcodebuild -workspace OktaAuthSdk.xcworkspace -scheme "OktaAuthNative iOS" -destination "platform=iOS Simulator,OS=latest,name=iPhone 11" clean test
17+
run: xcodebuild -workspace OktaAuthSdk.xcworkspace -scheme "OktaAuthNative iOS" -destination "platform=iOS Simulator,OS=latest,name=iPhone 15 Pro Max" clean test
1618
- name: Swift
1719
run: swift test -v
1820
PackageValidation:
19-
runs-on: macos-11
21+
runs-on: macos-latest
22+
env:
23+
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
2024
steps:
2125
- uses: actions/checkout@v2
2226
- name: Cocoapods

OktaAuthNative.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@
836836
"@executable_path/Frameworks",
837837
"@loader_path/Frameworks",
838838
);
839-
MARKETING_VERSION = 2.4.4;
839+
MARKETING_VERSION = 2.4.6;
840840
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
841841
MTL_FAST_MATH = YES;
842842
ONLY_ACTIVE_ARCH = YES;
@@ -912,7 +912,7 @@
912912
"@executable_path/Frameworks",
913913
"@loader_path/Frameworks",
914914
);
915-
MARKETING_VERSION = 2.4.4;
915+
MARKETING_VERSION = 2.4.6;
916916
MTL_ENABLE_DEBUG_INFO = NO;
917917
MTL_FAST_MATH = YES;
918918
PRODUCT_BUNDLE_IDENTIFIER = "com.okta.auth-swift";

OktaAuthSdk.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'OktaAuthSdk'
3-
s.version = '2.4.5'
3+
s.version = '2.4.6'
44
s.summary = 'SDK for Okta native authentication.'
55
s.description = <<-DESC
66
Integrate your native app with Okta.
@@ -14,7 +14,7 @@ Integrate your native app with Okta.
1414
s.ios.deployment_target = '10.0'
1515
s.osx.deployment_target = '10.14'
1616
s.source_files = 'Source/**/*'
17-
s.resources = 'Source/Resources/**/*'
17+
s.resource_bundles = { 'OktaAuthSdk' => 'Source/Resources/**/*' }
1818
s.swift_version = '5.0'
1919
s.exclude_files = [
2020
'Source/Info.plist'

Source/RestAPI/Utils.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import UIKit
1717
#endif
1818

1919
public func sdkVersion() -> String {
20-
return "2.4.4"
20+
return "2.4.6"
2121
}
2222

2323
internal func buildUserAgent() -> String {

0 commit comments

Comments
 (0)