Skip to content

Commit 8d69afd

Browse files
committed
Add PrivacyInfo.xcprivacy for CordovaLib & iOS template
1 parent 92017bb commit 8d69afd

File tree

7 files changed

+66
-8
lines changed

7 files changed

+66
-8
lines changed

Cordova.podspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ Pod::Spec.new do |s|
3434
s.platform = :ios, "11.0"
3535
s.source = relSource
3636
s.requires_arc = true
37-
s.frameworks = 'Foundation'
37+
s.frameworks = ["Foundation", "UIKit", "WebKit"]
3838
s.source_files = 'CordovaLib/**/*.{h,m}'
3939
s.public_header_files = 'CordovaLib/include/**/*.h'
40+
s.resource_bundles = { "Cordova" => ["CordovaLib/Cordova/PrivacyInfo.xcprivacy"] }
4041
end
4142

4243
#

CordovaLib/Cordova/Info.plist

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>CordovaLib</string>
79
<key>CFBundleExecutable</key>
810
<string>$(EXECUTABLE_NAME)</string>
911
<key>CFBundleIdentifier</key>
@@ -13,12 +15,12 @@
1315
<key>CFBundleName</key>
1416
<string>$(PRODUCT_NAME)</string>
1517
<key>CFBundlePackageType</key>
16-
<string>FMWK</string>
18+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1719
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
20+
<string>7.0.2-dev</string>
1921
<key>CFBundleVersion</key>
2022
<string>$(CURRENT_PROJECT_VERSION)</string>
21-
<key>NSPrincipalClass</key>
22-
<string></string>
23+
<key>NSHumanReadableCopyright</key>
24+
<string>Copyright 2012 The Apache Software Foundation</string>
2325
</dict>
2426
</plist>
+14
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>NSPrivacyTracking</key>
6+
<false/>
7+
<key>NSPrivacyCollectedDataTypes</key>
8+
<array/>
9+
<key>NSPrivacyAccessedAPITypes</key>
10+
<array/>
11+
<key>NSPrivacyTrackingDomains</key>
12+
<array/>
13+
</dict>
14+
</plist>

CordovaLib/CordovaLib.xcodeproj/project.pbxproj

+27
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
9052DE8E2150D06B008E83D4 /* CDVIntentAndNavigationFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3093E2211B16D6A3003F381A /* CDVIntentAndNavigationFilter.h */; };
9595
9052DE8F2150D06B008E83D4 /* CDVHandleOpenURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 7ED95CF81AB9028C008C4574 /* CDVHandleOpenURL.h */; };
9696
9059F51C26F2CE2400B3B2B7 /* CDVURLSchemeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F4D42BA23F218BA00501999 /* CDVURLSchemeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
97+
90B382512AEB72DD00F3F4D7 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 902D0BC12AEB64EB009C68E5 /* PrivacyInfo.xcprivacy */; };
9798
A3B082D41BB15CEA00D8DC35 /* CDVGestureHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = A3B082D21BB15CEA00D8DC35 /* CDVGestureHandler.h */; };
9899
A3B082D51BB15CEA00D8DC35 /* CDVGestureHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A3B082D31BB15CEA00D8DC35 /* CDVGestureHandler.m */; };
99100
C0C01EB61E3911D50056E6CB /* Cordova.h in Headers */ = {isa = PBXBuildFile; fileRef = C0C01EB41E3911D50056E6CB /* Cordova.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -172,6 +173,7 @@
172173
7ED95D321AB9029B008C4574 /* NSDictionary+CordovaPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+CordovaPreferences.m"; sourceTree = "<group>"; };
173174
7ED95D331AB9029B008C4574 /* NSMutableArray+QueueAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+QueueAdditions.h"; sourceTree = "<group>"; };
174175
7ED95D341AB9029B008C4574 /* NSMutableArray+QueueAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+QueueAdditions.m"; sourceTree = "<group>"; };
176+
902D0BC12AEB64EB009C68E5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
175177
A3B082D21BB15CEA00D8DC35 /* CDVGestureHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVGestureHandler.h; sourceTree = "<group>"; };
176178
A3B082D31BB15CEA00D8DC35 /* CDVGestureHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVGestureHandler.m; sourceTree = "<group>"; };
177179
C0C01EB21E3911D50056E6CB /* Cordova.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Cordova.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -363,6 +365,7 @@
363365
children = (
364366
C0C01EB41E3911D50056E6CB /* Cordova.h */,
365367
C0C01EB51E3911D50056E6CB /* Info.plist */,
368+
902D0BC12AEB64EB009C68E5 /* PrivacyInfo.xcprivacy */,
366369
);
367370
path = Cordova;
368371
sourceTree = "<group>";
@@ -457,6 +460,7 @@
457460
C0C01EAF1E3911D50056E6CB /* Headers */,
458461
C0C01EAD1E3911D50056E6CB /* Sources */,
459462
C0C01EAE1E3911D50056E6CB /* Frameworks */,
463+
90B382502AEB72D300F3F4D7 /* Resources */,
460464
);
461465
buildRules = (
462466
);
@@ -522,6 +526,17 @@
522526
};
523527
/* End PBXProject section */
524528

529+
/* Begin PBXResourcesBuildPhase section */
530+
90B382502AEB72D300F3F4D7 /* Resources */ = {
531+
isa = PBXResourcesBuildPhase;
532+
buildActionMask = 2147483647;
533+
files = (
534+
90B382512AEB72DD00F3F4D7 /* PrivacyInfo.xcprivacy in Resources */,
535+
);
536+
runOnlyForDeploymentPostprocessing = 0;
537+
};
538+
/* End PBXResourcesBuildPhase section */
539+
525540
/* Begin PBXSourcesBuildPhase section */
526541
C0C01EAD1E3911D50056E6CB /* Sources */ = {
527542
isa = PBXSourcesBuildPhase;
@@ -645,6 +660,7 @@
645660
COPY_PHASE_STRIP = NO;
646661
DEBUG_INFORMATION_FORMAT = dwarf;
647662
DEFINES_MODULE = YES;
663+
ENABLE_MODULE_VERIFIER = YES;
648664
ENABLE_STRICT_OBJC_MSGSEND = YES;
649665
ENABLE_TESTABILITY = YES;
650666
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -665,6 +681,8 @@
665681
GCC_WARN_UNUSED_VARIABLE = YES;
666682
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
667683
MERGEABLE_LIBRARY = YES;
684+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
685+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
668686
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
669687
MTL_FAST_MATH = YES;
670688
ONLY_ACTIVE_ARCH = YES;
@@ -712,6 +730,7 @@
712730
COPY_PHASE_STRIP = NO;
713731
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
714732
DEFINES_MODULE = YES;
733+
ENABLE_MODULE_VERIFIER = YES;
715734
ENABLE_NS_ASSERTIONS = NO;
716735
ENABLE_STRICT_OBJC_MSGSEND = YES;
717736
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -727,6 +746,8 @@
727746
GCC_WARN_UNUSED_VARIABLE = YES;
728747
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
729748
MERGEABLE_LIBRARY = YES;
749+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
750+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
730751
MTL_ENABLE_DEBUG_INFO = NO;
731752
MTL_FAST_MATH = YES;
732753
OTHER_LDFLAGS = "-ObjC";
@@ -740,10 +761,12 @@
740761
C0C01EB71E3911D50056E6CB /* Debug */ = {
741762
isa = XCBuildConfiguration;
742763
buildSettings = {
764+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
743765
DYLIB_INSTALL_NAME_BASE = "@rpath";
744766
ENABLE_MODULE_VERIFIER = YES;
745767
INFOPLIST_FILE = Cordova/Info.plist;
746768
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
769+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
747770
LD_RUNPATH_SEARCH_PATHS = (
748771
"$(inherited)",
749772
"@executable_path/Frameworks",
@@ -752,6 +775,7 @@
752775
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
753776
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
754777
PRODUCT_BUNDLE_IDENTIFIER = org.apache.cordova.Cordova;
778+
SKIP_INSTALL = NO;
755779
TARGETED_DEVICE_FAMILY = "1,2";
756780
VERSIONING_SYSTEM = "apple-generic";
757781
VERSION_INFO_PREFIX = "";
@@ -761,10 +785,12 @@
761785
C0C01EB81E3911D50056E6CB /* Release */ = {
762786
isa = XCBuildConfiguration;
763787
buildSettings = {
788+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
764789
DYLIB_INSTALL_NAME_BASE = "@rpath";
765790
ENABLE_MODULE_VERIFIER = YES;
766791
INFOPLIST_FILE = Cordova/Info.plist;
767792
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
793+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
768794
LD_RUNPATH_SEARCH_PATHS = (
769795
"$(inherited)",
770796
"@executable_path/Frameworks",
@@ -773,6 +799,7 @@
773799
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
774800
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
775801
PRODUCT_BUNDLE_IDENTIFIER = org.apache.cordova.Cordova;
802+
SKIP_INSTALL = NO;
776803
TARGETED_DEVICE_FAMILY = "1,2";
777804
VERSIONING_SYSTEM = "apple-generic";
778805
VERSION_INFO_PREFIX = "";

Package.swift

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.5
22

33
/*
44
Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,8 @@ import PackageDescription
2424
let package = Package(
2525
name: "Cordova",
2626
platforms: [
27-
.iOS(.v11)
27+
.iOS(.v11),
28+
.macCatalyst(.v13)
2829
],
2930
products: [
3031
.library(name: "CordovaLib", targets: ["Cordova"])
@@ -35,6 +36,9 @@ let package = Package(
3536
name: "Cordova",
3637
path: "CordovaLib/",
3738
exclude: ["Cordova/Cordova.h", "Cordova/Info.plist"],
39+
resources: [
40+
.copy("Cordova/PrivacyInfo.xcprivacy")
41+
],
3842
cSettings: [
3943
.headerSearchPath("Classes/Private")
4044
]

templates/project/__PROJECT_NAME__.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
4E7CA2B6272ABB0D00177EF9 /* config.xml in Copy Staging Resources */ = {isa = PBXBuildFile; fileRef = F840E1F0165FE0F500CFE078 /* config.xml */; };
1717
4E7CA2B7272ABB0D00177EF9 /* www in Copy Staging Resources */ = {isa = PBXBuildFile; fileRef = 301BF56E109A69640062928A /* www */; };
1818
6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; };
19+
90B630EF2AECBBD0009EF368 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 90B630EE2AECBBD0009EF368 /* PrivacyInfo.xcprivacy */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXContainerItemProxy section */
@@ -74,6 +75,7 @@
7475
32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "__PROJECT_NAME__-Prefix.pch"; sourceTree = "<group>"; };
7576
6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CDVLaunchScreen.storyboard; sourceTree = "<group>"; };
7677
8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "__PROJECT_NAME__-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
78+
90B630EE2AECBBD0009EF368 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
7779
EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = "<group>"; };
7880
EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = "<group>"; };
7981
ED33DF2A687741AEAF9F8254 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
@@ -120,6 +122,7 @@
120122
29B97315FDCFA39411CA2CEA /* __PROJECT_NAME__ */ = {
121123
isa = PBXGroup;
122124
children = (
125+
90B630EE2AECBBD0009EF368 /* PrivacyInfo.xcprivacy */,
123126
8D1107310486CEB800E47090 /* __PROJECT_NAME__-Info.plist */,
124127
32CA4F630368D1EE00C91783 /* __PROJECT_NAME__-Prefix.pch */,
125128
6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */,
@@ -269,6 +272,7 @@
269272
files = (
270273
302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */,
271274
0207DA581B56EA530066E2B4 /* Assets.xcassets in Resources */,
275+
90B630EF2AECBBD0009EF368 /* PrivacyInfo.xcprivacy in Resources */,
272276
6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */,
273277
);
274278
runOnlyForDeploymentPostprocessing = 0;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
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+
</dict>
6+
</plist>

0 commit comments

Comments
 (0)