Update test apps to support Mac Catalyst (#40)

omaralbeik · web-flow · commit 8638804eda5a · 2022-10-07T19:24:59.000+02:00
diff --git a/.spi.yml b/.spi.yml
@@ -0,0 +1,5 @@
+version: 1
+builder:
+  configs:
+    - documentation_targets:
+      - Drops
diff --git a/Drops.podspec b/Drops.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'Drops'
-    s.version = '1.5.0'
+    s.version = '1.6.0'
     s.summary = 'A µFramework for showing iOS 13 like system alerts'
     s.description = <<-DESC
     A µFramework for showing alerts like the one used when copying from pasteboard or connecting Apple pencil.
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.module_name  = 'Drops'
     s.source = { :git => 'https://github.com/omaralbeik/Drops.git', :tag => s.version }
     s.source_files = 'Sources/**/*.swift'
-    s.swift_versions = ['5.1', '5.2', '5.3']
+    s.swift_versions = ['5.5', '5.6', '5.7']
     s.requires_arc = true
     s.ios.deployment_target = '13.0'
 end
diff --git a/Drops.xcodeproj/project.pbxproj b/Drops.xcodeproj/project.pbxproj
@@ -128,6 +128,8 @@
 		07D8147D26361DB7003F51DB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		07D8148B26361DC6003F51DB /* Drop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Drop.swift; sourceTree = "<group>"; };
 		07D8149D26361DE8003F51DB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../UIKitExample/ViewController.swift; sourceTree = "<group>"; };
+		07EB028828F08EA900ABC5B3 /* SwiftUIExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftUIExample.entitlements; sourceTree = "<group>"; };
+		07EB028928F08ECE00ABC5B3 /* UIKitExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = UIKitExample.entitlements; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -168,6 +170,7 @@
 		074941EB2642CCD20031D338 /* UIKitExample */ = {
 			isa = PBXGroup;
 			children = (
+				07EB028928F08ECE00ABC5B3 /* UIKitExample.entitlements */,
 				074941FA2642CCD50031D338 /* Info.plist */,
 				074941EC2642CCD20031D338 /* AppDelegate.swift */,
 				074941EE2642CCD20031D338 /* SceneDelegate.swift */,
@@ -181,6 +184,7 @@
 		074942092642D4140031D338 /* SwiftUIExample */ = {
 			isa = PBXGroup;
 			children = (
+				07EB028828F08EA900ABC5B3 /* SwiftUIExample.entitlements */,
 				074942132642D4160031D338 /* Info.plist */,
 				0749420A2642D4140031D338 /* App.swift */,
 				0749420C2642D4140031D338 /* ContentView.swift */,
@@ -553,6 +557,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_ENTITLEMENTS = UIKitExample/UIKitExample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = C3VKVFB3SA;
@@ -564,6 +569,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.omaralbeik.drops.uikit-example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -574,6 +582,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_ENTITLEMENTS = UIKitExample/UIKitExample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = C3VKVFB3SA;
@@ -585,6 +594,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.omaralbeik.drops.uikit-example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -595,6 +607,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_ENTITLEMENTS = SwiftUIExample/SwiftUIExample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = C3VKVFB3SA;
@@ -607,6 +620,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.omaralbeik.drops.swiftui-example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -617,6 +633,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CODE_SIGN_ENTITLEMENTS = SwiftUIExample/SwiftUIExample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = C3VKVFB3SA;
@@ -629,6 +646,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.omaralbeik.drops.swiftui-example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -778,7 +798,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.omaralbeik.drops;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -807,7 +829,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.omaralbeik.drops;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,4 +15,4 @@ DEPENDENCIES
   xcpretty-json-formatter
 
 BUNDLED WITH
-   2.1.4
+   2.3.22
diff --git a/README.md b/README.md
@@ -119,7 +119,7 @@ The [Swift Package Manager](https://swift.org/package-manager/) is a tool for ma
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/omaralbeik/Drops.git", from: "1.5.0")
+    .package(url: "https://github.com/omaralbeik/Drops.git", from: "1.6.0")
 ]
 ```
 
@@ -134,15 +134,15 @@ $ swift build
 To integrate Drops into your Xcode project using [CocoaPods](https://cocoapods.org), specify it in your Podfile:
 
 ```rb
-pod 'Drops', :git => 'https://github.com/omaralbeik/Drops.git', :tag => '1.5.0'
+pod 'Drops', :git => 'https://github.com/omaralbeik/Drops.git', :tag => '1.6.0'
 ```
 
 ### Carthage
 
 To integrate Drops into your Xcode project using [Carthage](https://github.com/Carthage/Carthage), specify it in your Cartfile:
 
 ```
-github "omaralbeik/Drops" ~> 1.5.0
+github "omaralbeik/Drops" ~> 1.6.0
 ```
 
 ### Manually
diff --git a/Sources/Drops.swift b/Sources/Drops.swift
@@ -20,6 +20,7 @@
 //  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
+
 #if os(iOS)
 import UIKit
 
diff --git a/Sources/Weak.swift b/Sources/Weak.swift
@@ -21,10 +21,12 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 internal struct Weak<T: AnyObject> {
   init(value: T?) {
     self.value = value
   }
 
   weak var value: T?
 }
+#endif
diff --git a/SwiftUIExample/SwiftUIExample.entitlements b/SwiftUIExample/SwiftUIExample.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Tests/AnimatorTests.swift b/Tests/AnimatorTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -209,3 +210,4 @@ final class AnimatorTests: XCTestCase {
     XCTAssertNil(endedState)
   }
 }
+#endif
diff --git a/Tests/DropTests.swift b/Tests/DropTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -81,3 +82,4 @@ final class DropTests: XCTestCase {
     XCTAssertEqual(Drop.Duration.seconds(1).value, 1)
   }
 }
+#endif
diff --git a/Tests/DropViewTests.swift b/Tests/DropViewTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -179,3 +180,4 @@ extension Drop: Equatable {
     return lhs.title == rhs.title
   }
 }
+#endif
diff --git a/Tests/DropsTests.swift b/Tests/DropsTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -239,3 +240,4 @@ private extension Task where Success == Never, Failure == Never {
     }
   }
 }
+#endif
diff --git a/Tests/PassthroughViewTests.swift b/Tests/PassthroughViewTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -33,3 +34,4 @@ final class PassthroughViewTests: XCTestCase {
     XCTAssertNil(result)
   }
 }
+#endif
diff --git a/Tests/PassthroughWindowTests.swift b/Tests/PassthroughWindowTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -38,3 +39,4 @@ final class PassthroughWindowTests: XCTestCase {
     XCTAssertNil(result)
   }
 }
+#endif
diff --git a/Tests/PresenterTests.swift b/Tests/PresenterTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -98,3 +99,4 @@ final class PresenterTests: XCTestCase {
     hide(animated: false)
   }
 }
+#endif
diff --git a/Tests/TestAnimatorDelegate.swift b/Tests/TestAnimatorDelegate.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 @testable import Drops
 
 final class TestAnimatorDelegate: AnimatorDelegate {
@@ -40,3 +41,4 @@ final class TestAnimatorDelegate: AnimatorDelegate {
     didCallPanEnded = true
   }
 }
+#endif
diff --git a/Tests/WeakTests.swift b/Tests/WeakTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -37,3 +38,4 @@ final class WeakTests: XCTestCase {
 
   private final class TestClass: NSObject {}
 }
+#endif
diff --git a/Tests/WindowViewControllerTests.swift b/Tests/WindowViewControllerTests.swift
@@ -21,6 +21,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+#if os(iOS)
 import XCTest
 @testable import Drops
 
@@ -71,3 +72,4 @@ final class WindowViewControllerTests: XCTestCase {
     XCTAssertEqual(controller.top, controller)
   }
 }
+#endif
diff --git a/UIKitExample/UIKitExample.entitlements b/UIKitExample/UIKitExample.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,12 @@`
`21`	`21`	`// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN`
`22`	`22`	`// THE SOFTWARE.`
`23`	`23`
	`24`	`+#if os(iOS)`
`24`	`25`	`internal struct Weak<T: AnyObject> {`
`25`	`26`	`init(value: T?) {`
`26`	`27`	`self.value = value`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`weak var value: T?`
`30`	`31`	`}`
	`32`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN`
`22`	`22`	`// THE SOFTWARE.`
`23`	`23`
	`24`	`+#if os(iOS)`
`24`	`25`	`import XCTest`
`25`	`26`	`@testable import Drops`
`26`	`27`
`@@ -209,3 +210,4 @@ final class AnimatorTests: XCTestCase {`
`209`	`210`	`XCTAssertNil(endedState)`
`210`	`211`	`}`
`211`	`212`	`}`
	`213`	`+#endif`