Skip to content

Commit

Permalink
Fix "Multiple commands produce PrivacyInfo.xcprivacy" error (#166)
Browse files Browse the repository at this point in the history
* Fix "Multiple commands produce PrivacyInfo.xcprivacy" error

* Update Github Actions macOS runner environment

* Update target simulator
  • Loading branch information
mikenachbaur-okta authored Aug 2, 2024
1 parent e8fd454 commit 8345ba3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/okta-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@ 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
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:
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
Expand Down
4 changes: 2 additions & 2 deletions OktaAuthNative.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions OktaAuthSdk.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Source/RestAPI/Utils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import UIKit
#endif

public func sdkVersion() -> String {
return "2.4.4"
return "2.4.6"
}

internal func buildUserAgent() -> String {
Expand Down

0 comments on commit 8345ba3

Please sign in to comment.