From 9dabfb7fd56fab89a464b55164a19624aed7f578 Mon Sep 17 00:00:00 2001 From: Selvam Manickam Date: Thu, 4 Apr 2024 12:09:55 -0700 Subject: [PATCH 1/2] Apple Upcoming Requirements Privacy Manifests: https://developer.apple.com/support/third-party-SDK-requirements/ App Store Connect upload requirement https://developer.apple.com/news/?id=fxu2qp7b --- .../xcschemes/ObjectMapper-Package.xcscheme | 67 ++++++++++++++++ .../xcschemes/ObjectMapper.xcscheme | 79 +++++++++++++++++++ .vscode/settings.json | 1 + ObjectMapper.podspec | 17 ++-- ObjectMapper.xcodeproj/project.pbxproj | 24 +++--- .../ObjectMapper-Mac-Static.xcscheme | 67 ++++++++++++++++ .../xcschemes/ObjectMapper-Mac.xcscheme | 22 +++--- .../xcschemes/ObjectMapper-iOS.xcscheme | 22 +++--- .../xcschemes/ObjectMapper-tvOS.xcscheme | 22 +++--- .../xcschemes/ObjectMapper-watchOS.xcscheme | 22 +++--- Package.swift | 10 +-- Sources/Resources/PrivacyInfo.xcprivacy | 14 ++++ 12 files changed, 294 insertions(+), 73 deletions(-) create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme create mode 100644 .vscode/settings.json create mode 100644 ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme create mode 100644 Sources/Resources/PrivacyInfo.xcprivacy diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme new file mode 100644 index 00000000..ac7694d3 --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme new file mode 100644 index 00000000..b30ef1da --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/ObjectMapper.podspec b/ObjectMapper.podspec index 7c8a27b9..ea39199e 100644 --- a/ObjectMapper.podspec +++ b/ObjectMapper.podspec @@ -1,16 +1,21 @@ Pod::Spec.new do |s| s.name = 'ObjectMapper' - s.version = '4.2.0' + s.version = '4.4.0' s.license = 'MIT' + # Ensure developers won't hit CocoaPods/CocoaPods#11402 with the resource + # bundle for the privacy manifest. + s.cocoapods_version = '>= 1.12.0' s.summary = 'JSON Object mapping written in Swift' s.homepage = 'https://github.com/tristanhimmelman/ObjectMapper' s.authors = { 'Tristan Himmelman' => 'tristanhimmelman@gmail.com' } s.source = { :git => 'https://github.com/tristanhimmelman/ObjectMapper.git', :tag => s.version.to_s } - - s.watchos.deployment_target = '2.0' - s.ios.deployment_target = '13.0' - s.osx.deployment_target = '10.10' - s.tvos.deployment_target = '9.0' + s.resource_bundle = { + "Privacy" => "Sources/ObjectMapper/Resources/PrivacyInfo.xcprivacy" + } + s.watchos.deployment_target = '10.0' + s.ios.deployment_target = '17.0' + s.osx.deployment_target = '12.0' + s.tvos.deployment_target = '17.0' s.swift_version = '5.0' diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj index d5c3298c..0e26978d 100644 --- a/ObjectMapper.xcodeproj/project.pbxproj +++ b/ObjectMapper.xcodeproj/project.pbxproj @@ -1114,7 +1114,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 17.0; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; @@ -1143,7 +1143,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 17.0; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; @@ -1161,7 +1161,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_VERSION = 4.2; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 17.0; }; name = Debug; }; @@ -1179,7 +1179,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_VERSION = 4.2; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 17.0; }; name = Release; }; @@ -1207,7 +1207,7 @@ SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; TVOS_DEPLOYMENT_TARGET = 9.0; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 10.0; }; name = Debug; }; @@ -1235,7 +1235,7 @@ SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 4; TVOS_DEPLOYMENT_TARGET = 9.0; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 10.0; }; name = Release; }; @@ -1363,6 +1363,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -1385,6 +1386,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -1405,6 +1407,7 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1418,6 +1421,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Tests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1445,7 +1449,7 @@ INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; @@ -1473,7 +1477,7 @@ INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; SDKROOT = macosx; @@ -1495,7 +1499,7 @@ ); INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; @@ -1512,7 +1516,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme new file mode 100644 index 00000000..77debb44 --- /dev/null +++ b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme index bbd21f5e..2b0c5191 100644 --- a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme +++ b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme @@ -41,6 +41,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -53,17 +62,6 @@ - - - - - - - - + + + + @@ -53,17 +62,6 @@ - - - - - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - + + + + @@ -39,17 +48,6 @@ - - - - - - - - + + + + NSPrivacyAccessedAPITypes + + NSPrivacyCollectedDataTypes + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + + From 6c638e729e7ef95860fdad6d848bfb980ff3c3fc Mon Sep 17 00:00:00 2001 From: Selvam Manickam Date: Thu, 4 Apr 2024 12:17:07 -0700 Subject: [PATCH 2/2] Removed unwanted files Code cleanup --- .../xcschemes/ObjectMapper-Package.xcscheme | 67 ---------------- .../xcschemes/ObjectMapper.xcscheme | 79 ------------------- .vscode/settings.json | 1 - .../ObjectMapper-Mac-Static.xcscheme | 67 ---------------- 4 files changed, 214 deletions(-) delete mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme delete mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme delete mode 100644 .vscode/settings.json delete mode 100644 ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme deleted file mode 100644 index ac7694d3..00000000 --- a/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper-Package.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme deleted file mode 100644 index b30ef1da..00000000 --- a/.swiftpm/xcode/xcshareddata/xcschemes/ObjectMapper.xcscheme +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 9e26dfee..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme b/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme deleted file mode 100644 index 77debb44..00000000 --- a/ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac-Static.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -