Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "Multiple commands produce PrivacyInfo.xcprivacy" error #166

Merged
merged 3 commits into from
Aug 2, 2024
Merged

Fix "Multiple commands produce PrivacyInfo.xcprivacy" error #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21d84a5
Fix "Multiple commands produce PrivacyInfo.xcprivacy" error
mikenachbaur-okta Jul 31, 2024
abc5e39
Update Github Actions macOS runner environment
mikenachbaur-okta Aug 1, 2024
b8eba01
Update target simulator
mikenachbaur-okta Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/okta-auth.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading