From be52806c3b95f9210955a8a94259d40f8a9e928d Mon Sep 17 00:00:00 2001 From: Daniel Chick Date: Thu, 11 Apr 2024 12:29:33 -0500 Subject: [PATCH] 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. --- Cartfile | 5 - Cartfile.resolved | 2 - NotificationBanner.xcodeproj/project.pbxproj | 112 ++++++++++++------ .../contents.xcworkspacedata | 2 +- .../xcshareddata/swiftpm/Package.resolved | 24 ++++ .../xcschemes/NotificationBanner.xcscheme | 6 +- NotificationBannerSwift.podspec | 13 +- Package.resolved | 8 +- Package.swift | 6 +- README.md | 2 +- 10 files changed, 115 insertions(+), 65 deletions(-) delete mode 100755 Cartfile delete mode 100755 Cartfile.resolved create mode 100644 NotificationBanner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Cartfile b/Cartfile deleted file mode 100755 index 4fdee6f9..00000000 --- a/Cartfile +++ /dev/null @@ -1,5 +0,0 @@ -# A scolling drop-in replacement for UILabel for long texts. -github "cbpowell/MarqueeLabel" ~> 4.0.0 - -# A Swift Autolayout DSL for iOS & OS X -github "SnapKit/SnapKit" ~> 5.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100755 index 668905d3..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,2 +0,0 @@ -github "SnapKit/SnapKit" "5.0.1" -github "cbpowell/MarqueeLabel" "4.0.0" diff --git a/NotificationBanner.xcodeproj/project.pbxproj b/NotificationBanner.xcodeproj/project.pbxproj index a78a0952..02c164e2 100755 --- a/NotificationBanner.xcodeproj/project.pbxproj +++ b/NotificationBanner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -18,10 +18,9 @@ 823255B31EB87313006F95C3 /* NotificationBannerQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823255A31EB87313006F95C3 /* NotificationBannerQueue.swift */; }; 823255B41EB87313006F95C3 /* StatusBarNotificationBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823255A41EB87313006F95C3 /* StatusBarNotificationBanner.swift */; }; 823255B61EB87313006F95C3 /* NotificationBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 823255A71EB87313006F95C3 /* NotificationBanner.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 823255B91EB8736D006F95C3 /* Cartfile in Resources */ = {isa = PBXBuildFile; fileRef = 823255B81EB8736D006F95C3 /* Cartfile */; }; A999043F1EEF64F0006DA132 /* BannerHapticGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A999043E1EEF64F0006DA132 /* BannerHapticGenerator.swift */; }; - EA9A178A1EC75DE000CF2261 /* MarqueeLabel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA9A17891EC75DE000CF2261 /* MarqueeLabel.framework */; }; - EA9A178C1EC75DE400CF2261 /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA9A178B1EC75DE400CF2261 /* SnapKit.framework */; }; + BDB71E322BC8508500E946A4 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = BDB71E312BC8508500E946A4 /* SnapKit */; }; + BDB71E372BC8509E00E946A4 /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = BDB71E362BC8509E00E946A4 /* MarqueeLabel */; }; F63A905B2381423E00F70CEB /* UIWindow+orientation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F63A90592381423E00F70CEB /* UIWindow+orientation.swift */; }; F7E13CF61FB192ED0008EE4C /* NotificationBannerUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E13CF51FB192ED0008EE4C /* NotificationBannerUtilities.swift */; }; /* End PBXBuildFile section */ @@ -41,12 +40,8 @@ 823255A41EB87313006F95C3 /* StatusBarNotificationBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarNotificationBanner.swift; sourceTree = ""; }; 823255A61EB87313006F95C3 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 823255A71EB87313006F95C3 /* NotificationBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationBanner.h; sourceTree = ""; }; - 823255B81EB8736D006F95C3 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = ""; }; - 823255BB1EB87CB7006F95C3 /* Cartfile.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.resolved; sourceTree = ""; }; 951D609C1F71BF82008E4BCC /* NotificationBannerUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationBannerUtilities.swift; sourceTree = ""; }; A999043E1EEF64F0006DA132 /* BannerHapticGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerHapticGenerator.swift; sourceTree = ""; }; - EA9A17891EC75DE000CF2261 /* MarqueeLabel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MarqueeLabel.framework; path = Carthage/Build/iOS/MarqueeLabel.framework; sourceTree = ""; }; - EA9A178B1EC75DE400CF2261 /* SnapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SnapKit.framework; path = Carthage/Build/iOS/SnapKit.framework; sourceTree = ""; }; F63A90592381423E00F70CEB /* UIWindow+orientation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIWindow+orientation.swift"; sourceTree = ""; }; F7E13CF51FB192ED0008EE4C /* NotificationBannerUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationBannerUtilities.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -56,8 +51,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EA9A178A1EC75DE000CF2261 /* MarqueeLabel.framework in Frameworks */, - EA9A178C1EC75DE400CF2261 /* SnapKit.framework in Frameworks */, + BDB71E322BC8508500E946A4 /* SnapKit in Frameworks */, + BDB71E372BC8509E00E946A4 /* MarqueeLabel in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,7 +62,6 @@ 823255811EB872AB006F95C3 = { isa = PBXGroup; children = ( - 823255B71EB8735E006F95C3 /* Root Files */, 8232558D1EB872AB006F95C3 /* NotificationBanner */, 8232558C1EB872AB006F95C3 /* Products */, EA9A17881EC75DE000CF2261 /* Frameworks */, @@ -122,20 +116,9 @@ path = "Supporting Files"; sourceTree = ""; }; - 823255B71EB8735E006F95C3 /* Root Files */ = { - isa = PBXGroup; - children = ( - 823255B81EB8736D006F95C3 /* Cartfile */, - 823255BB1EB87CB7006F95C3 /* Cartfile.resolved */, - ); - name = "Root Files"; - sourceTree = ""; - }; EA9A17881EC75DE000CF2261 /* Frameworks */ = { isa = PBXGroup; children = ( - EA9A178B1EC75DE400CF2261 /* SnapKit.framework */, - EA9A17891EC75DE000CF2261 /* MarqueeLabel.framework */, ); name = Frameworks; sourceTree = ""; @@ -168,6 +151,10 @@ dependencies = ( ); name = NotificationBanner; + packageProductDependencies = ( + BDB71E312BC8508500E946A4 /* SnapKit */, + BDB71E362BC8509E00E946A4 /* MarqueeLabel */, + ); productName = NotificationBanner; productReference = 8232558B1EB872AB006F95C3 /* NotificationBanner.framework */; productType = "com.apple.product-type.framework"; @@ -178,7 +165,8 @@ 823255821EB872AB006F95C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1530; ORGANIZATIONNAME = "Dalton Hinterscher"; TargetAttributes = { 8232558A1EB872AB006F95C3 = { @@ -196,6 +184,10 @@ Base, ); mainGroup = 823255811EB872AB006F95C3; + packageReferences = ( + BDB71E302BC8508500E946A4 /* XCRemoteSwiftPackageReference "SnapKit" */, + BDB71E352BC8509E00E946A4 /* XCRemoteSwiftPackageReference "MarqueeLabel" */, + ); productRefGroup = 8232558C1EB872AB006F95C3 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -210,7 +202,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 823255B91EB8736D006F95C3 /* Cartfile in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -244,6 +235,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -265,6 +257,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -276,6 +269,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -290,7 +284,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -306,6 +300,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -327,6 +322,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -338,6 +334,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -346,10 +343,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -365,14 +363,16 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + ENABLE_MODULE_VERIFIER = YES; INFOPLIST_FILE = "$(SRCROOT)/NotificationBanner/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -388,14 +388,16 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + ENABLE_MODULE_VERIFIER = YES; INFOPLIST_FILE = "$(SRCROOT)/NotificationBanner/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.dh.NotificationBanner; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -425,6 +427,38 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + BDB71E302BC8508500E946A4 /* XCRemoteSwiftPackageReference "SnapKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SnapKit/SnapKit"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.7.1; + }; + }; + BDB71E352BC8509E00E946A4 /* XCRemoteSwiftPackageReference "MarqueeLabel" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/cbpowell/MarqueeLabel"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.5.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + BDB71E312BC8508500E946A4 /* SnapKit */ = { + isa = XCSwiftPackageProductDependency; + package = BDB71E302BC8508500E946A4 /* XCRemoteSwiftPackageReference "SnapKit" */; + productName = SnapKit; + }; + BDB71E362BC8509E00E946A4 /* MarqueeLabel */ = { + isa = XCSwiftPackageProductDependency; + package = BDB71E352BC8509E00E946A4 /* XCRemoteSwiftPackageReference "MarqueeLabel" */; + productName = MarqueeLabel; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 823255821EB872AB006F95C3 /* Project object */; } diff --git a/NotificationBanner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/NotificationBanner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 2f14e194..919434a6 100755 --- a/NotificationBanner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/NotificationBanner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/NotificationBanner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NotificationBanner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..e6a7c0c6 --- /dev/null +++ b/NotificationBanner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,24 @@ +{ + "originHash" : "2cd5226517eb8502063579cd80820b855cacd994f63ff7012771df4d679600f1", + "pins" : [ + { + "identity" : "marqueelabel", + "kind" : "remoteSourceControl", + "location" : "https://github.com/cbpowell/MarqueeLabel", + "state" : { + "revision" : "877e810534cda9afabb8143ae319b7c3341b121b", + "version" : "4.5.0" + } + }, + { + "identity" : "snapkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SnapKit/SnapKit", + "state" : { + "revision" : "2842e6e84e82eb9a8dac0100ca90d9444b0307f4", + "version" : "5.7.1" + } + } + ], + "version" : 3 +} diff --git a/NotificationBanner.xcodeproj/xcshareddata/xcschemes/NotificationBanner.xcscheme b/NotificationBanner.xcodeproj/xcshareddata/xcschemes/NotificationBanner.xcscheme index 33c58144..b01f8290 100755 --- a/NotificationBanner.xcodeproj/xcshareddata/xcschemes/NotificationBanner.xcscheme +++ b/NotificationBanner.xcodeproj/xcshareddata/xcschemes/NotificationBanner.xcscheme @@ -1,6 +1,6 @@ - - - - 'daltonhint4@gmail.com' } s.source = { :git => 'https://github.com/Daltron/NotificationBanner.git', :tag => s.version.to_s } - s.ios.deployment_target = '10.0' + s.ios.deployment_target = '12.0' s.swift_version = '5.0' s.source_files = 'NotificationBanner/Classes/**/*' - s.dependency 'SnapKit', '~> 5.6.0' - s.dependency 'MarqueeLabel', '~> 4.3.0' + s.dependency 'SnapKit', '~> 5.7.1' + s.dependency 'MarqueeLabel', '~> 4.5.0' + + s.resource_bundle = { + "NotificationBannerPrivacyInfo" => "NotificationBanner/Supporting Files/PrivacyInfo.xcprivacy" + } end diff --git a/Package.resolved b/Package.resolved index 7d8203ce..6f07315d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/cbpowell/MarqueeLabel", "state": { "branch": null, - "revision": "f2c72a5f8568579dade6350dc26a482076d3d346", - "version": "4.3.0" + "revision": "877e810534cda9afabb8143ae319b7c3341b121b", + "version": "4.5.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/SnapKit/SnapKit", "state": { "branch": null, - "revision": "f222cbdf325885926566172f6f5f06af95473158", - "version": "5.6.0" + "revision": "2842e6e84e82eb9a8dac0100ca90d9444b0307f4", + "version": "5.7.1" } } ] diff --git a/Package.swift b/Package.swift index b17b0d0b..21180216 100644 --- a/Package.swift +++ b/Package.swift @@ -4,14 +4,14 @@ import PackageDescription let package = Package( name: "NotificationBannerSwift", platforms: [ - .iOS(.v10) + .iOS(.v12) ], products: [ .library(name: "NotificationBannerSwift", targets: ["NotificationBannerSwift"]) ], dependencies: [ - .package(url: "https://github.com/SnapKit/SnapKit", from: "5.0.1"), - .package(url: "https://github.com/cbpowell/MarqueeLabel", from: "4.0.1") + .package(url: "https://github.com/SnapKit/SnapKit", from: "5.7.1"), + .package(url: "https://github.com/cbpowell/MarqueeLabel", from: "4.5.0") ], targets: [ .target( diff --git a/README.md b/README.md index ee50b110..58473ffa 100755 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ NotificationBanner is an extremely customizable and lightweight library that mak ## Requirements - - iOS 10.0+ + - iOS 12.0+ - Xcode 10.0+ ## Installation