Skip to content

Commit d6a03f3

Browse files
tristanhimmelmantristanhimmelman
authored
Merge pull request #1142 from selvam4274/Apple-Upcoming-Requirements
Update Apple Upcoming Requirements
2 parents acc15d6 + 6c638e7 commit d6a03f3

File tree

8 files changed

+80
-73
lines changed

8 files changed

+80
-73
lines changed

‎ObjectMapper.podspec‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
Pod::Spec.new do |s|
22
s.name = 'ObjectMapper'
3-
s.version = '4.2.0'
3+
s.version = '4.4.0'
44
s.license = 'MIT'
5+
# Ensure developers won't hit CocoaPods/CocoaPods#11402 with the resource
6+
# bundle for the privacy manifest.
7+
s.cocoapods_version = '>= 1.12.0'
58
s.summary = 'JSON Object mapping written in Swift'
69
s.homepage = 'https://github.com/tristanhimmelman/ObjectMapper'
710
s.authors = { 'Tristan Himmelman' => '[email protected]' }
811
s.source = { :git => 'https://github.com/tristanhimmelman/ObjectMapper.git', :tag => s.version.to_s }
9-
10-
s.watchos.deployment_target = '2.0'
11-
s.ios.deployment_target = '13.0'
12-
s.osx.deployment_target = '10.10'
13-
s.tvos.deployment_target = '9.0'
12+
s.resource_bundle = {
13+
"Privacy" => "Sources/ObjectMapper/Resources/PrivacyInfo.xcprivacy"
14+
}
15+
s.watchos.deployment_target = '10.0'
16+
s.ios.deployment_target = '17.0'
17+
s.osx.deployment_target = '12.0'
18+
s.tvos.deployment_target = '17.0'
1419

1520
s.swift_version = '5.0'
1621

‎ObjectMapper.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@
11141114
SKIP_INSTALL = YES;
11151115
SWIFT_VERSION = 4.2;
11161116
TARGETED_DEVICE_FAMILY = 3;
1117-
TVOS_DEPLOYMENT_TARGET = 9.0;
1117+
TVOS_DEPLOYMENT_TARGET = 17.0;
11181118
WATCHOS_DEPLOYMENT_TARGET = 2.0;
11191119
};
11201120
name = Debug;
@@ -1143,7 +1143,7 @@
11431143
SKIP_INSTALL = YES;
11441144
SWIFT_VERSION = 4.2;
11451145
TARGETED_DEVICE_FAMILY = 3;
1146-
TVOS_DEPLOYMENT_TARGET = 9.0;
1146+
TVOS_DEPLOYMENT_TARGET = 17.0;
11471147
WATCHOS_DEPLOYMENT_TARGET = 2.0;
11481148
};
11491149
name = Release;
@@ -1161,7 +1161,7 @@
11611161
PRODUCT_NAME = "$(TARGET_NAME)";
11621162
SDKROOT = appletvos;
11631163
SWIFT_VERSION = 4.2;
1164-
TVOS_DEPLOYMENT_TARGET = 9.0;
1164+
TVOS_DEPLOYMENT_TARGET = 17.0;
11651165
};
11661166
name = Debug;
11671167
};
@@ -1179,7 +1179,7 @@
11791179
PRODUCT_NAME = "$(TARGET_NAME)";
11801180
SDKROOT = appletvos;
11811181
SWIFT_VERSION = 4.2;
1182-
TVOS_DEPLOYMENT_TARGET = 9.0;
1182+
TVOS_DEPLOYMENT_TARGET = 17.0;
11831183
};
11841184
name = Release;
11851185
};
@@ -1207,7 +1207,7 @@
12071207
SWIFT_VERSION = 4.2;
12081208
TARGETED_DEVICE_FAMILY = 4;
12091209
TVOS_DEPLOYMENT_TARGET = 9.0;
1210-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
1210+
WATCHOS_DEPLOYMENT_TARGET = 10.0;
12111211
};
12121212
name = Debug;
12131213
};
@@ -1235,7 +1235,7 @@
12351235
SWIFT_VERSION = 4.2;
12361236
TARGETED_DEVICE_FAMILY = 4;
12371237
TVOS_DEPLOYMENT_TARGET = 9.0;
1238-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
1238+
WATCHOS_DEPLOYMENT_TARGET = 10.0;
12391239
};
12401240
name = Release;
12411241
};
@@ -1363,6 +1363,7 @@
13631363
DYLIB_INSTALL_NAME_BASE = "@rpath";
13641364
INFOPLIST_FILE = Sources/Info.plist;
13651365
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1366+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
13661367
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13671368
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
13681369
PRODUCT_NAME = "$(PROJECT_NAME)";
@@ -1385,6 +1386,7 @@
13851386
DYLIB_INSTALL_NAME_BASE = "@rpath";
13861387
INFOPLIST_FILE = Sources/Info.plist;
13871388
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1389+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
13881390
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13891391
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
13901392
PRODUCT_NAME = "$(PROJECT_NAME)";
@@ -1405,6 +1407,7 @@
14051407
"$(inherited)",
14061408
);
14071409
INFOPLIST_FILE = Tests/Info.plist;
1410+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
14081411
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14091412
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
14101413
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1418,6 +1421,7 @@
14181421
buildSettings = {
14191422
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
14201423
INFOPLIST_FILE = Tests/Info.plist;
1424+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
14211425
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14221426
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
14231427
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1445,7 +1449,7 @@
14451449
INFOPLIST_FILE = Sources/Info.plist;
14461450
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14471451
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1448-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1452+
MACOSX_DEPLOYMENT_TARGET = 12.0;
14491453
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
14501454
PRODUCT_NAME = "$(PROJECT_NAME)";
14511455
SDKROOT = macosx;
@@ -1473,7 +1477,7 @@
14731477
INFOPLIST_FILE = Sources/Info.plist;
14741478
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14751479
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1476-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1480+
MACOSX_DEPLOYMENT_TARGET = 12.0;
14771481
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
14781482
PRODUCT_NAME = "$(PROJECT_NAME)";
14791483
SDKROOT = macosx;
@@ -1495,7 +1499,7 @@
14951499
);
14961500
INFOPLIST_FILE = Tests/Info.plist;
14971501
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1498-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1502+
MACOSX_DEPLOYMENT_TARGET = 12.0;
14991503
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
15001504
PRODUCT_NAME = "$(TARGET_NAME)";
15011505
SDKROOT = macosx;
@@ -1512,7 +1516,7 @@
15121516
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
15131517
INFOPLIST_FILE = Tests/Info.plist;
15141518
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1515-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1519+
MACOSX_DEPLOYMENT_TARGET = 12.0;
15161520
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
15171521
PRODUCT_NAME = "$(TARGET_NAME)";
15181522
SDKROOT = macosx;

‎ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-Mac.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "CD1602FE1AC023D5000CD69A"
48+
BuildableName = "ObjectMapper.framework"
49+
BlueprintName = "ObjectMapper-macOS"
50+
ReferencedContainer = "container:ObjectMapper.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "CD1602FE1AC023D5000CD69A"
60-
BuildableName = "ObjectMapper.framework"
61-
BlueprintName = "ObjectMapper-macOS"
62-
ReferencedContainer = "container:ObjectMapper.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:ObjectMapper.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Release"

‎ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-iOS.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "6AAC8F7519F03C2900E7A677"
48+
BuildableName = "ObjectMapper.framework"
49+
BlueprintName = "ObjectMapper-iOS"
50+
ReferencedContainer = "container:ObjectMapper.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "6AAC8F7519F03C2900E7A677"
60-
BuildableName = "ObjectMapper.framework"
61-
BlueprintName = "ObjectMapper-iOS"
62-
ReferencedContainer = "container:ObjectMapper.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:ObjectMapper.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Release"

‎ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-tvOS.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "6A05B7A51BE274BE00F19B53"
34+
BuildableName = "ObjectMapper.framework"
35+
BlueprintName = "ObjectMapper-tvOS"
36+
ReferencedContainer = "container:ObjectMapper.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "6A05B7A51BE274BE00F19B53"
46-
BuildableName = "ObjectMapper.framework"
47-
BlueprintName = "ObjectMapper-tvOS"
48-
ReferencedContainer = "container:ObjectMapper.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:ObjectMapper.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎ObjectMapper.xcodeproj/xcshareddata/xcschemes/ObjectMapper-watchOS.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "6A2AD03C1B2C78540097E150"
34+
BuildableName = "ObjectMapper.framework"
35+
BlueprintName = "ObjectMapper-watchOS"
36+
ReferencedContainer = "container:ObjectMapper.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "6A2AD03C1B2C78540097E150"
46-
BuildableName = "ObjectMapper.framework"
47-
BlueprintName = "ObjectMapper-watchOS"
48-
ReferencedContainer = "container:ObjectMapper.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:ObjectMapper.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎Package.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.3
22

33
import PackageDescription
44

55
let package = Package(name: "ObjectMapper",
6-
platforms: [.macOS(.v10_10),
7-
.iOS(.v13),
8-
.tvOS(.v9),
9-
.watchOS(.v2)],
6+
platforms: [.macOS(.v12),
7+
.iOS(.v17),
8+
.tvOS(.v17),
9+
.watchOS(.v10)],
1010
products: [.library(name: "ObjectMapper",
1111
targets: ["ObjectMapper"])],
1212
targets: [.target(name: "ObjectMapper",

‎Sources/Resources/PrivacyInfo.xcprivacy‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyAccessedAPITypes</key>
6+
<array/>
7+
<key>NSPrivacyCollectedDataTypes</key>
8+
<array/>
9+
<key>NSPrivacyTracking</key>
10+
<false/>
11+
<key>NSPrivacyTrackingDomains</key>
12+
<array/>
13+
</dict>
14+
</plist>

0 commit comments

Comments
 (0)