Skip to content

Commit be52806

Browse files
chickdanchickdan
authored
Update Dependencies for Privacy Manifest (#426)
* Bump Carthage * Bump Podspec * Bump Package * Update ReadMe * Fix missed deployment target bump. Xcode generated changes. * Switch from Carthage to SPM for dependencies * Updated to recommended settings. Removed Carthage search path.
1 parent 1406ac6 commit be52806

10 files changed

Lines changed: 115 additions & 65 deletions

File tree

‎Cartfile‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Cartfile.resolved‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎NotificationBanner.xcodeproj/project.pbxproj‎

Lines changed: 73 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -18,10 +18,9 @@
1818
823255B31EB87313006F95C3 /* NotificationBannerQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823255A31EB87313006F95C3 /* NotificationBannerQueue.swift */; };
1919
823255B41EB87313006F95C3 /* StatusBarNotificationBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823255A41EB87313006F95C3 /* StatusBarNotificationBanner.swift */; };
2020
823255B61EB87313006F95C3 /* NotificationBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 823255A71EB87313006F95C3 /* NotificationBanner.h */; settings = {ATTRIBUTES = (Public, ); }; };
21-
823255B91EB8736D006F95C3 /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 823255B81EB8736D006F95C3 /* Cartfile */; };
2221
A999043F1EEF64F0006DA132 /* BannerHapticGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A999043E1EEF64F0006DA132 /* BannerHapticGenerator.swift */; };
23-
EA9A178A1EC75DE000CF2261 /* MarqueeLabel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA9A17891EC75DE000CF2261 /* MarqueeLabel.framework */; };
24-
EA9A178C1EC75DE400CF2261 /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA9A178B1EC75DE400CF2261 /* SnapKit.framework */; };
22+
BDB71E322BC8508500E946A4 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = BDB71E312BC8508500E946A4 /* SnapKit */; };
23+
BDB71E372BC8509E00E946A4 /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = BDB71E362BC8509E00E946A4 /* MarqueeLabel */; };
2524
F63A905B2381423E00F70CEB /* UIWindow+orientation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F63A90592381423E00F70CEB /* UIWindow+orientation.swift */; };
2625
F7E13CF61FB192ED0008EE4C /* NotificationBannerUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E13CF51FB192ED0008EE4C /* NotificationBannerUtilities.swift */; };
2726
/* End PBXBuildFile section */
@@ -41,12 +40,8 @@
4140
823255A41EB87313006F95C3 /* StatusBarNotificationBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarNotificationBanner.swift; sourceTree = "<group>"; };
4241
823255A61EB87313006F95C3 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4342
823255A71EB87313006F95C3 /* NotificationBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationBanner.h; sourceTree = "<group>"; };
44-
823255B81EB8736D006F95C3 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
45-
823255BB1EB87CB7006F95C3 /* Cartfile.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.resolved; sourceTree = "<group>"; };
4643
951D609C1F71BF82008E4BCC /* NotificationBannerUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationBannerUtilities.swift; sourceTree = "<group>"; };
4744
A999043E1EEF64F0006DA132 /* BannerHapticGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerHapticGenerator.swift; sourceTree = "<group>"; };
48-
EA9A17891EC75DE000CF2261 /* MarqueeLabel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MarqueeLabel.framework; path = Carthage/Build/iOS/MarqueeLabel.framework; sourceTree = "<group>"; };
49-
EA9A178B1EC75DE400CF2261 /* SnapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SnapKit.framework; path = Carthage/Build/iOS/SnapKit.framework; sourceTree = "<group>"; };
5045
F63A90592381423E00F70CEB /* UIWindow+orientation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIWindow+orientation.swift"; sourceTree = "<group>"; };
5146
F7E13CF51FB192ED0008EE4C /* NotificationBannerUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationBannerUtilities.swift; sourceTree = "<group>"; };
5247
/* End PBXFileReference section */
@@ -56,8 +51,8 @@
5651
isa = PBXFrameworksBuildPhase;
5752
buildActionMask = 2147483647;
5853
files = (
59-
EA9A178A1EC75DE000CF2261 /* MarqueeLabel.framework in Frameworks */,
60-
EA9A178C1EC75DE400CF2261 /* SnapKit.framework in Frameworks */,
54+
BDB71E322BC8508500E946A4 /* SnapKit in Frameworks */,
55+
BDB71E372BC8509E00E946A4 /* MarqueeLabel in Frameworks */,
6156
);
6257
runOnlyForDeploymentPostprocessing = 0;
6358
};
@@ -67,7 +62,6 @@
6762
823255811EB872AB006F95C3 = {
6863
isa = PBXGroup;
6964
children = (
70-
823255B71EB8735E006F95C3 /* Root Files */,
7165
8232558D1EB872AB006F95C3 /* NotificationBanner */,
7266
8232558C1EB872AB006F95C3 /* Products */,
7367
EA9A17881EC75DE000CF2261 /* Frameworks */,
@@ -122,20 +116,9 @@
122116
path = "Supporting Files";
123117
sourceTree = "<group>";
124118
};
125-
823255B71EB8735E006F95C3 /* Root Files */ = {
126-
isa = PBXGroup;
127-
children = (
128-
823255B81EB8736D006F95C3 /* Cartfile */,
129-
823255BB1EB87CB7006F95C3 /* Cartfile.resolved */,
130-
);
131-
name = "Root Files";
132-
sourceTree = "<group>";
133-
};
134119
EA9A17881EC75DE000CF2261 /* Frameworks */ = {
135120
isa = PBXGroup;
136121
children = (
137-
EA9A178B1EC75DE400CF2261 /* SnapKit.framework */,
138-
EA9A17891EC75DE000CF2261 /* MarqueeLabel.framework */,
139122
);
140123
name = Frameworks;
141124
sourceTree = "<group>";
@@ -168,6 +151,10 @@
168151
dependencies = (
169152
);
170153
name = NotificationBanner;
154+
packageProductDependencies = (
155+
BDB71E312BC8508500E946A4 /* SnapKit */,
156+
BDB71E362BC8509E00E946A4 /* MarqueeLabel */,
157+
);
171158
productName = NotificationBanner;
172159
productReference = 8232558B1EB872AB006F95C3 /* NotificationBanner.framework */;
173160
productType = "com.apple.product-type.framework";
@@ -178,7 +165,8 @@
178165
823255821EB872AB006F95C3 /* Project object */ = {
179166
isa = PBXProject;
180167
attributes = {
181-
LastUpgradeCheck = 1020;
168+
BuildIndependentTargetsInParallel = YES;
169+
LastUpgradeCheck = 1530;
182170
ORGANIZATIONNAME = "Dalton Hinterscher";
183171
TargetAttributes = {
184172
8232558A1EB872AB006F95C3 = {
@@ -196,6 +184,10 @@
196184
Base,
197185
);
198186
mainGroup = 823255811EB872AB006F95C3;
187+
packageReferences = (
188+
BDB71E302BC8508500E946A4 /* XCRemoteSwiftPackageReference "SnapKit" */,
189+
BDB71E352BC8509E00E946A4 /* XCRemoteSwiftPackageReference "MarqueeLabel" */,
190+
);
199191
productRefGroup = 8232558C1EB872AB006F95C3 /* Products */;
200192
projectDirPath = "";
201193
projectRoot = "";
@@ -210,7 +202,6 @@
210202
isa = PBXResourcesBuildPhase;
211203
buildActionMask = 2147483647;
212204
files = (
213-
823255B91EB8736D006F95C3 /* Cartfile in Resources */,
214205
);
215206
runOnlyForDeploymentPostprocessing = 0;
216207
};
@@ -244,6 +235,7 @@
244235
isa = XCBuildConfiguration;
245236
buildSettings = {
246237
ALWAYS_SEARCH_USER_PATHS = NO;
238+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
247239
CLANG_ANALYZER_NONNULL = YES;
248240
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
249241
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -265,6 +257,7 @@
265257
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
266258
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
267259
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
260+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
268261
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
269262
CLANG_WARN_STRICT_PROTOTYPES = YES;
270263
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -276,6 +269,7 @@
276269
DEBUG_INFORMATION_FORMAT = dwarf;
277270
ENABLE_STRICT_OBJC_MSGSEND = YES;
278271
ENABLE_TESTABILITY = YES;
272+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
279273
GCC_C_LANGUAGE_STANDARD = gnu99;
280274
GCC_DYNAMIC_NO_PIC = NO;
281275
GCC_NO_COMMON_BLOCKS = YES;
@@ -290,7 +284,7 @@
290284
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
291285
GCC_WARN_UNUSED_FUNCTION = YES;
292286
GCC_WARN_UNUSED_VARIABLE = YES;
293-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
287+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
294288
MTL_ENABLE_DEBUG_INFO = YES;
295289
ONLY_ACTIVE_ARCH = YES;
296290
SDKROOT = iphoneos;
@@ -306,6 +300,7 @@
306300
isa = XCBuildConfiguration;
307301
buildSettings = {
308302
ALWAYS_SEARCH_USER_PATHS = NO;
303+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
309304
CLANG_ANALYZER_NONNULL = YES;
310305
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
311306
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -327,6 +322,7 @@
327322
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
328323
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
329324
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
325+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
330326
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
331327
CLANG_WARN_STRICT_PROTOTYPES = YES;
332328
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -338,6 +334,7 @@
338334
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
339335
ENABLE_NS_ASSERTIONS = NO;
340336
ENABLE_STRICT_OBJC_MSGSEND = YES;
337+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
341338
GCC_C_LANGUAGE_STANDARD = gnu99;
342339
GCC_NO_COMMON_BLOCKS = YES;
343340
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -346,10 +343,11 @@
346343
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
347344
GCC_WARN_UNUSED_FUNCTION = YES;
348345
GCC_WARN_UNUSED_VARIABLE = YES;
349-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
346+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
350347
MTL_ENABLE_DEBUG_INFO = NO;
351348
SDKROOT = iphoneos;
352-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
349+
SWIFT_COMPILATION_MODE = wholemodule;
350+
SWIFT_OPTIMIZATION_LEVEL = "-O";
353351
TARGETED_DEVICE_FAMILY = "1,2";
354352
VALIDATE_PRODUCT = YES;
355353
VERSIONING_SYSTEM = "apple-generic";
@@ -365,14 +363,16 @@
365363
DYLIB_COMPATIBILITY_VERSION = 1;
366364
DYLIB_CURRENT_VERSION = 1;
367365
DYLIB_INSTALL_NAME_BASE = "@rpath";
368-
FRAMEWORK_SEARCH_PATHS = (
369-
"$(inherited)",
370-
"$(PROJECT_DIR)/Carthage/Build/iOS",
371-
);
366+
ENABLE_MODULE_VERIFIER = YES;
372367
INFOPLIST_FILE = "$(SRCROOT)/NotificationBanner/Supporting Files/Info.plist";
373368
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
374-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
375-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
369+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
370+
LD_RUNPATH_SEARCH_PATHS = (
371+
"$(inherited)",
372+
"@executable_path/Frameworks",
373+
"@loader_path/Frameworks",
374+
);
375+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
376376
PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner;
377377
PRODUCT_NAME = "$(TARGET_NAME)";
378378
SKIP_INSTALL = YES;
@@ -388,14 +388,16 @@
388388
DYLIB_COMPATIBILITY_VERSION = 1;
389389
DYLIB_CURRENT_VERSION = 1;
390390
DYLIB_INSTALL_NAME_BASE = "@rpath";
391-
FRAMEWORK_SEARCH_PATHS = (
392-
"$(inherited)",
393-
"$(PROJECT_DIR)/Carthage/Build/iOS",
394-
);
391+
ENABLE_MODULE_VERIFIER = YES;
395392
INFOPLIST_FILE = "$(SRCROOT)/NotificationBanner/Supporting Files/Info.plist";
396393
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
397-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
398-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
394+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
395+
LD_RUNPATH_SEARCH_PATHS = (
396+
"$(inherited)",
397+
"@executable_path/Frameworks",
398+
"@loader_path/Frameworks",
399+
);
400+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
399401
PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner;
400402
PRODUCT_NAME = "$(TARGET_NAME)";
401403
SKIP_INSTALL = YES;
@@ -425,6 +427,38 @@
425427
defaultConfigurationName = Release;
426428
};
427429
/* End XCConfigurationList section */
430+
431+
/* Begin XCRemoteSwiftPackageReference section */
432+
BDB71E302BC8508500E946A4 /* XCRemoteSwiftPackageReference "SnapKit" */ = {
433+
isa = XCRemoteSwiftPackageReference;
434+
repositoryURL = "https://github.com/SnapKit/SnapKit";
435+
requirement = {
436+
kind = upToNextMajorVersion;
437+
minimumVersion = 5.7.1;
438+
};
439+
};
440+
BDB71E352BC8509E00E946A4 /* XCRemoteSwiftPackageReference "MarqueeLabel" */ = {
441+
isa = XCRemoteSwiftPackageReference;
442+
repositoryURL = "https://github.com/cbpowell/MarqueeLabel";
443+
requirement = {
444+
kind = upToNextMajorVersion;
445+
minimumVersion = 4.5.0;
446+
};
447+
};
448+
/* End XCRemoteSwiftPackageReference section */
449+
450+
/* Begin XCSwiftPackageProductDependency section */
451+
BDB71E312BC8508500E946A4 /* SnapKit */ = {
452+
isa = XCSwiftPackageProductDependency;
453+
package = BDB71E302BC8508500E946A4 /* XCRemoteSwiftPackageReference "SnapKit" */;
454+
productName = SnapKit;
455+
};
456+
BDB71E362BC8509E00E946A4 /* MarqueeLabel */ = {
457+
isa = XCSwiftPackageProductDependency;
458+
package = BDB71E352BC8509E00E946A4 /* XCRemoteSwiftPackageReference "MarqueeLabel" */;
459+
productName = MarqueeLabel;
460+
};
461+
/* End XCSwiftPackageProductDependency section */
428462
};
429463
rootObject = 823255821EB872AB006F95C3 /* Project object */;
430464
}

‎NotificationBanner.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NotificationBanner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NotificationBanner.xcodeproj/xcshareddata/xcschemes/NotificationBanner.xcscheme‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:NotificationBanner.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎NotificationBannerSwift.podspec‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
Pod::Spec.new do |s|
32
s.name = 'NotificationBannerSwift'
4-
s.version = '3.2.1'
3+
s.version = '4.0.0'
54
s.summary = 'The easiest way to display in app notification banners in iOS.'
65

76
s.description = <<-DESC
@@ -13,11 +12,15 @@ NotificationBanner is an extremely customizable and lightweight library that mak
1312
s.author = { 'Daltron' => 'daltonhint4@gmail.com' }
1413
s.source = { :git => 'https://github.com/Daltron/NotificationBanner.git', :tag => s.version.to_s }
1514

16-
s.ios.deployment_target = '10.0'
15+
s.ios.deployment_target = '12.0'
1716
s.swift_version = '5.0'
1817
s.source_files = 'NotificationBanner/Classes/**/*'
1918

20-
s.dependency 'SnapKit', '~> 5.6.0'
21-
s.dependency 'MarqueeLabel', '~> 4.3.0'
19+
s.dependency 'SnapKit', '~> 5.7.1'
20+
s.dependency 'MarqueeLabel', '~> 4.5.0'
21+
22+
s.resource_bundle = {
23+
"NotificationBannerPrivacyInfo" => "NotificationBanner/Supporting Files/PrivacyInfo.xcprivacy"
24+
}
2225

2326
end

‎Package.resolved‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)