From ff0b914c25f0638a08c837d433841d4fa22a79cc Mon Sep 17 00:00:00 2001
From: Alex Nachbaur <74688448+mikenachbaur-okta@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:44:48 -0700
Subject: [PATCH] Fix "Multiple commands produce PrivacyInfo.xcprivacy" error
 (#364)

---
 OktaOidc.podspec                    | 4 ++--
 Sources/AppAuth/OktaUserAgent.m     | 2 +-
 okta-oidc.xcodeproj/project.pbxproj | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OktaOidc.podspec b/OktaOidc.podspec
index 4691e7c1f8b..6c2be5fe706 100644
--- a/OktaOidc.podspec
+++ b/OktaOidc.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'OktaOidc'
-  s.version          = '3.11.6'
+  s.version          = '3.11.7'
   s.summary          = 'SDK to easily integrate AppAuth with Okta'
   s.description      = <<-DESC
 Integrate your native app with Okta using the AppAuth library.
@@ -21,7 +21,7 @@ Integrate your native app with Okta using the AppAuth library.
   s.subspec 'Okta' do |okta|
      okta.dependency 'OktaOidc/AppAuth'
      okta.source_files = 'Sources/OktaOidc/**/*.{h,swift}'
-     okta.resources    = 'Sources/OktaOidc/Common/Resources/**/*'
+     okta.resource_bundles = { 'OktaOidc' => 'Sources/OktaOidc/Common/Resources/**/*' }
      okta.exclude_files = 'Sources/OktaOidc/Common/Exports.swift'
      okta.ios.deployment_target = '11.0'
      okta.osx.deployment_target = '10.14'
diff --git a/Sources/AppAuth/OktaUserAgent.m b/Sources/AppAuth/OktaUserAgent.m
index d2621e07b22..523c5af9f7f 100644
--- a/Sources/AppAuth/OktaUserAgent.m
+++ b/Sources/AppAuth/OktaUserAgent.m
@@ -22,7 +22,7 @@ +(void)setUserAgentValue:(NSString*)value {
 }
 
 +(NSString*)userAgentVersion {
-    return @"3.11.6";
+    return @"3.11.7";
 }
 
 +(NSString*)userAgentHeaderKey {
diff --git a/okta-oidc.xcodeproj/project.pbxproj b/okta-oidc.xcodeproj/project.pbxproj
index 3e4dee4a989..e3ecc573f28 100644
--- a/okta-oidc.xcodeproj/project.pbxproj
+++ b/okta-oidc.xcodeproj/project.pbxproj
@@ -1800,7 +1800,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.11.6;
+				MARKETING_VERSION = 3.11.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc";
 				PRODUCT_NAME = OktaOidc;
 				SKIP_INSTALL = YES;
@@ -1830,7 +1830,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.11.6;
+				MARKETING_VERSION = 3.11.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc";
 				PRODUCT_NAME = OktaOidc;
 				SKIP_INSTALL = YES;
@@ -1978,7 +1978,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 3.11.6;
+				MARKETING_VERSION = 3.11.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc";
 				PRODUCT_NAME = OktaOidc;
 				SDKROOT = macosx;
@@ -2005,7 +2005,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 3.11.6;
+				MARKETING_VERSION = 3.11.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc";
 				PRODUCT_NAME = OktaOidc;
 				SDKROOT = macosx;