From 8345ba3a329285ea4fa7d8a9daffb5a7b4323edc Mon Sep 17 00:00:00 2001
From: Alex Nachbaur <74688448+mikenachbaur-okta@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:06:26 -0700
Subject: [PATCH] Fix "Multiple commands produce PrivacyInfo.xcprivacy" error
 (#166)

* Fix "Multiple commands produce PrivacyInfo.xcprivacy" error

* Update Github Actions macOS runner environment

* Update target simulator
---
 .github/workflows/okta-auth.yml          | 10 +++++++---
 OktaAuthNative.xcodeproj/project.pbxproj |  4 ++--
 OktaAuthSdk.podspec                      |  4 ++--
 Source/RestAPI/Utils.swift               |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/okta-auth.yml b/.github/workflows/okta-auth.yml
index 26d9f5d..3de40a8 100644
--- a/.github/workflows/okta-auth.yml
+++ b/.github/workflows/okta-auth.yml
@@ -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
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 {