From 87c5d7b075de5e9e852122ca51b4d0d11e316de0 Mon Sep 17 00:00:00 2001 From: jarrodlombardo-EventBase <128871683+jarrodlombardo-EventBase@users.noreply.github.com> Date: Tue, 2 Jan 2024 12:13:42 -0800 Subject: [PATCH 1/6] Update to ios12 (#1) Update minimum targets to 12.0 so they can be built in XCode 15 --- .../contents.xcworkspacedata | 7 ++ .../xcschemes/MBProgressHUD.xcscheme | 66 +++++++++++++++++++ CHANGELOG.mdown | 3 + Demo/HudDemo.xcodeproj/project.pbxproj | 16 ++--- MBProgressHUD.podspec | 6 +- MBProgressHUD.xcodeproj/project.pbxproj | 12 ++-- README.mdown | 8 +-- 7 files changed, 99 insertions(+), 19 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/MBProgressHUD.xcscheme diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/MBProgressHUD.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/MBProgressHUD.xcscheme new file mode 100644 index 000000000..bfd840495 --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/MBProgressHUD.xcscheme @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index fea8717fb..0f2696167 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -1,3 +1,6 @@ +**Version 2.0.0** @ 02.01.24 +- Requires iOS 12.0+ to work in XCode 15.0.1 + **Version 1.0.0** @ 14.07.16 - Requires ARC and iOS 6+. diff --git a/Demo/HudDemo.xcodeproj/project.pbxproj b/Demo/HudDemo.xcodeproj/project.pbxproj index d68e8beeb..86f9d05d4 100644 --- a/Demo/HudDemo.xcodeproj/project.pbxproj +++ b/Demo/HudDemo.xcodeproj/project.pbxproj @@ -442,7 +442,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = HudDemo/HudDemo_Prefix.pch; INFOPLIST_FILE = HudDemo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = "com.bukovinski.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = HudDemo; SUPPORTS_MACCATALYST = YES; @@ -461,7 +461,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = HudDemo/HudDemo_Prefix.pch; INFOPLIST_FILE = HudDemo/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_BUNDLE_IDENTIFIER = "com.bukovinski.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = HudDemo; SDKROOT = iphoneos; @@ -503,7 +503,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -541,7 +541,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SDKROOT = iphoneos; }; name = Release; @@ -575,7 +575,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -603,7 +603,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -630,7 +630,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = HudTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = com.bukovinski.HudTests; @@ -657,7 +657,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = HudTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = com.bukovinski.HudTests; diff --git a/MBProgressHUD.podspec b/MBProgressHUD.podspec index d76245104..306b2b069 100644 --- a/MBProgressHUD.podspec +++ b/MBProgressHUD.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MBProgressHUD" - s.version = "1.2.0" + s.version = "2.0.0" s.summary = "An iOS activity indicator view." s.description = <<-DESC MBProgressHUD is an iOS drop-in class that displays a translucent HUD @@ -12,8 +12,8 @@ Pod::Spec.new do |s| s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'Matej Bukovinski' => 'matej@bukovinski.com' } s.source = { :git => "https://github.com/matej/MBProgressHUD.git", :tag => s.version.to_s } - s.ios.deployment_target = '9.0' - s.tvos.deployment_target = '9.0' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' s.source_files = '*.{h,m}' s.frameworks = "CoreGraphics", "QuartzCore" s.requires_arc = true diff --git a/MBProgressHUD.xcodeproj/project.pbxproj b/MBProgressHUD.xcodeproj/project.pbxproj index a9dc64dd4..6041e81c3 100644 --- a/MBProgressHUD.xcodeproj/project.pbxproj +++ b/MBProgressHUD.xcodeproj/project.pbxproj @@ -312,7 +312,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -351,7 +351,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -382,6 +382,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "Framework-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 1.2; MTL_ENABLE_DEBUG_INFO = YES; @@ -417,6 +418,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = "Framework-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 1.2; MTL_ENABLE_DEBUG_INFO = NO; @@ -473,7 +475,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -515,7 +517,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -527,6 +529,7 @@ DSTROOT = /tmp/MBProgressHUD.dst; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MBProgressHUD-Prefix.pch"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = MBProgressHUD; SKIP_INSTALL = YES; @@ -539,6 +542,7 @@ DSTROOT = /tmp/MBProgressHUD.dst; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MBProgressHUD-Prefix.pch"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = MBProgressHUD; SKIP_INSTALL = YES; diff --git a/README.mdown b/README.mdown index e146bd178..e521ac482 100644 --- a/README.mdown +++ b/README.mdown @@ -15,7 +15,7 @@ ## Requirements -`MBProgressHUD` works on iOS 9.0+. It depends on the following Apple frameworks, which should already be included with most Xcode templates: +`MBProgressHUD` works on iOS 12.0+. It depends on the following Apple frameworks, which should already be included with most Xcode templates: * Foundation.framework * UIKit.framework @@ -29,13 +29,13 @@ You will need the latest developer tools in order to build `MBProgressHUD`. Old [CocoaPods](http://cocoapods.org) is the recommended way to add MBProgressHUD to your project. -1. Add a pod entry for MBProgressHUD to your Podfile `pod 'MBProgressHUD', '~> 1.2.0'` +1. Add a pod entry for MBProgressHUD to your Podfile `pod 'MBProgressHUD', '~> 2.0.0'` 2. Install the pod(s) by running `pod install`. 3. Include MBProgressHUD wherever you need it with `#import "MBProgressHUD.h"`. ### Carthage -1. Add MBProgressHUD to your Cartfile. e.g., `github "jdg/MBProgressHUD" ~> 1.2.0` +1. Add MBProgressHUD to your Cartfile. e.g., `github "jdg/MBProgressHUD" ~> 2.0.0` 2. Run `carthage update` 3. Follow the rest of the [standard Carthage installation instructions](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) to add MBProgressHUD to your project. @@ -43,7 +43,7 @@ You will need the latest developer tools in order to build `MBProgressHUD`. Old 1. Add the following to your `Package.swift`: ```swift - .package(url: "https://github.com/jdg/MBProgressHUD.git", .upToNextMajor(from: "1.2.0")), + .package(url: "https://github.com/jdg/MBProgressHUD.git", .upToNextMajor(from: "2.0.0")), ``` 2. Next, add `MBProgressHUD` to your App targets dependencies like so: ```swift From 5bdabf27277fc271480e3d42ce522d7668f1ee92 Mon Sep 17 00:00:00 2001 From: Lance Fu Date: Thu, 22 Feb 2024 14:57:44 -0800 Subject: [PATCH 2/6] PLAT-8219 - Added ProvacyInfo.xcprivacy --- MBProgressHUD.xcodeproj/project.pbxproj | 6 ++++++ PrivacyInfo.xcprivacy | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 PrivacyInfo.xcprivacy diff --git a/MBProgressHUD.xcodeproj/project.pbxproj b/MBProgressHUD.xcodeproj/project.pbxproj index 6041e81c3..1d69c5cea 100644 --- a/MBProgressHUD.xcodeproj/project.pbxproj +++ b/MBProgressHUD.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 1777D3E81D757B6E0037C7F1 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = D286A7521518C70F00E13FB8 /* MBProgressHUD.m */; }; 1D104D931ACA371400973364 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = D286A7521518C70F00E13FB8 /* MBProgressHUD.m */; }; 1D104D941ACA373100973364 /* MBProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = D286A7511518C70F00E13FB8 /* MBProgressHUD.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A5C3DAB32B8807940022800E /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A5C3DAB22B88078C0022800E /* PrivacyInfo.xcprivacy */; }; + A5C3DAB42B8808B20022800E /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A5C3DAB22B88078C0022800E /* PrivacyInfo.xcprivacy */; }; D286A74D1518C70F00E13FB8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D286A74C1518C70F00E13FB8 /* Foundation.framework */; }; D286A7531518C70F00E13FB8 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = D286A7521518C70F00E13FB8 /* MBProgressHUD.m */; }; D286A75E1518C89600E13FB8 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D286A75D1518C89600E13FB8 /* UIKit.framework */; }; @@ -37,6 +39,7 @@ 1777D3E21D757AF50037C7F1 /* Framework-tvOS-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Framework-tvOS-Info.plist"; sourceTree = SOURCE_ROOT; }; 1D104D7A1ACA36CC00973364 /* MBProgressHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MBProgressHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1D104D951ACA376200973364 /* Framework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Framework-Info.plist"; sourceTree = SOURCE_ROOT; }; + A5C3DAB22B88078C0022800E /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; D286A7491518C70F00E13FB8 /* libMBProgressHUD.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMBProgressHUD.a; sourceTree = BUILT_PRODUCTS_DIR; }; D286A74C1518C70F00E13FB8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D286A7511518C70F00E13FB8 /* MBProgressHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = SOURCE_ROOT; }; @@ -86,6 +89,7 @@ D286A73E1518C70E00E13FB8 = { isa = PBXGroup; children = ( + A5C3DAB22B88078C0022800E /* PrivacyInfo.xcprivacy */, D286A74E1518C70F00E13FB8 /* MBProgressHUD */, D286A74B1518C70F00E13FB8 /* Frameworks */, D286A74A1518C70F00E13FB8 /* Products */, @@ -241,6 +245,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A5C3DAB42B8808B20022800E /* PrivacyInfo.xcprivacy in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -248,6 +253,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A5C3DAB32B8807940022800E /* PrivacyInfo.xcprivacy in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/PrivacyInfo.xcprivacy b/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..08609d6b5 --- /dev/null +++ b/PrivacyInfo.xcprivacy @@ -0,0 +1,16 @@ + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyCollectedDataTypes + + + NSPrivacyAccessedAPITypes + + + + From 3c2163eb26afa847030cf0ba0768e68a5fc1b2a0 Mon Sep 17 00:00:00 2001 From: Lance Fu Date: Thu, 22 Feb 2024 14:59:08 -0800 Subject: [PATCH 3/6] PLAT-8219 - Updated CHANGELOG --- CHANGELOG.mdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index 0f2696167..d5a667a00 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -1,3 +1,6 @@ +**Unreleased** +- Adds ProvacyInfo.xcprivacy to satisfy upcoming Apple submission requirements. + **Version 2.0.0** @ 02.01.24 - Requires iOS 12.0+ to work in XCode 15.0.1 From db3fe35073d1ca99d6d26b089f69acad7fc78d3b Mon Sep 17 00:00:00 2001 From: Lance Fu Date: Thu, 22 Feb 2024 16:07:54 -0800 Subject: [PATCH 4/6] PLAT-8219 - Fixed typo --- CHANGELOG.mdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index d5a667a00..23f9c1a07 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -1,5 +1,5 @@ **Unreleased** -- Adds ProvacyInfo.xcprivacy to satisfy upcoming Apple submission requirements. +- Adds PrivacyInfo.xcprivacy to satisfy upcoming Apple submission requirements. **Version 2.0.0** @ 02.01.24 - Requires iOS 12.0+ to work in XCode 15.0.1 From cf5f228f47a672dc57ab97a0e550b268efd9f8fc Mon Sep 17 00:00:00 2001 From: Lance Fu Date: Mon, 26 Feb 2024 13:11:49 -0800 Subject: [PATCH 5/6] PLAT-8219 - Updated CHANGELOG --- CHANGELOG.mdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown index 23f9c1a07..8e3df3452 100644 --- a/CHANGELOG.mdown +++ b/CHANGELOG.mdown @@ -1,4 +1,4 @@ -**Unreleased** +**Version 2.0.1** @ 26.02.24 - Adds PrivacyInfo.xcprivacy to satisfy upcoming Apple submission requirements. **Version 2.0.0** @ 02.01.24 From 63fbae9c116efbcbb604296c7bc0a0f1711431fb Mon Sep 17 00:00:00 2001 From: "HyunJoon.Park" Date: Sat, 9 Mar 2024 04:22:24 +0800 Subject: [PATCH 6/6] Include privacy info for Cocoapods (#3) Added `resource_bundles` in Cocoapods to include the PrivacyInfo file to the bundle to support static linking. Can refer to the related discussion from the below links. https://github.com/SnapKit/SnapKit/pull/798 https://github.com/CocoaPods/CocoaPods/issues/10325#issuecomment-1718723762 Co-authored-by: Hyun Joon Park --- MBProgressHUD.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/MBProgressHUD.podspec b/MBProgressHUD.podspec index 306b2b069..e9b09882d 100644 --- a/MBProgressHUD.podspec +++ b/MBProgressHUD.podspec @@ -15,6 +15,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' s.source_files = '*.{h,m}' + s.resource_bundles = { 'MBProgressHUD_Privacy' => ['PrivacyInfo.xcprivacy'] } s.frameworks = "CoreGraphics", "QuartzCore" s.requires_arc = true end