swift 5 & spm updates

CoreKit · Jun 13, 2020 · 3445661 · 3445661
1 parent ec921d1
commit 3445661
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 549 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
+.DS_Store
+.build
+build
+.swiftpm
 xcuserdata/
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -3,52 +3,34 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		166DC0C92494F18A00E75C02 /* Sheet in Frameworks */ = {isa = PBXBuildFile; productRef = 166DC0C82494F18A00E75C02 /* Sheet */; };
 		16FCB5A721F277690071404B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FCB5A621F277690071404B /* AppDelegate.swift */; };
 		16FCB5A921F277690071404B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FCB5A821F277690071404B /* ViewController.swift */; };
 		16FCB5AC21F277690071404B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 16FCB5AA21F277690071404B /* Main.storyboard */; };
 		16FCB5AE21F277690071404B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 16FCB5AD21F277690071404B /* Assets.xcassets */; };
 		16FCB5B121F277690071404B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 16FCB5AF21F277690071404B /* LaunchScreen.storyboard */; };
 		16FCB5B921F2777A0071404B /* MySheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FCB5B821F2777A0071404B /* MySheetViewController.swift */; };
-		16FCB5C021F277FA0071404B /* Sheet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16FCB5BF21F277F40071404B /* Sheet.framework */; };
-		16FCB5C121F277FA0071404B /* Sheet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 16FCB5BF21F277F40071404B /* Sheet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		16FCB5BE21F277F40071404B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 16FCB5BA21F277F40071404B /* Sheet.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 16676D4C21F263F600DD600C;
-			remoteInfo = Sheet;
-		};
-		16FCB5C221F277FA0071404B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 16FCB5BA21F277F40071404B /* Sheet.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 16676D4B21F263F600DD600C;
-			remoteInfo = Sheet;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		16FCB5C421F277FA0071404B /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				16FCB5C121F277FA0071404B /* Sheet.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		166DC0C62494F18200E75C02 /* Sheet */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sheet; path = ..; sourceTree = "<group>"; };
 		16FCB5A321F277690071404B /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		16FCB5A621F277690071404B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		16FCB5A821F277690071404B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -57,27 +39,34 @@
 		16FCB5B021F277690071404B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		16FCB5B221F277690071404B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		16FCB5B821F2777A0071404B /* MySheetViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MySheetViewController.swift; sourceTree = "<group>"; };
-		16FCB5BA21F277F40071404B /* Sheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sheet.xcodeproj; path = ../Sheet.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		16FCB5A021F277690071404B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				16FCB5C021F277FA0071404B /* Sheet.framework in Frameworks */,
+				166DC0C92494F18A00E75C02 /* Sheet in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		166DC0C72494F18A00E75C02 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		16FCB59A21F277690071404B = {
 			isa = PBXGroup;
 			children = (
-				16FCB5BA21F277F40071404B /* Sheet.xcodeproj */,
+				166DC0C62494F18200E75C02 /* Sheet */,
 				16FCB5A521F277690071404B /* Example */,
 				16FCB5A421F277690071404B /* Products */,
+				166DC0C72494F18A00E75C02 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -103,14 +92,6 @@
 			path = Example;
 			sourceTree = "<group>";
 		};
-		16FCB5BB21F277F40071404B /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				16FCB5BF21F277F40071404B /* Sheet.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -126,9 +107,11 @@
 			buildRules = (
 			);
 			dependencies = (
-				16FCB5C321F277FA0071404B /* PBXTargetDependency */,
 			);
 			name = Example;
+			packageProductDependencies = (
+				166DC0C82494F18A00E75C02 /* Sheet */,
+			);
 			productName = Example;
 			productReference = 16FCB5A321F277690071404B /* Example.app */;
 			productType = "com.apple.product-type.application";
@@ -159,29 +142,13 @@
 			mainGroup = 16FCB59A21F277690071404B;
 			productRefGroup = 16FCB5A421F277690071404B /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 16FCB5BB21F277F40071404B /* Products */;
-					ProjectRef = 16FCB5BA21F277F40071404B /* Sheet.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				16FCB5A221F277690071404B /* Example */,
 			);
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		16FCB5BF21F277F40071404B /* Sheet.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Sheet.framework;
-			remoteRef = 16FCB5BE21F277F40071404B /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		16FCB5A121F277690071404B /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -208,14 +175,6 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		16FCB5C321F277FA0071404B /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Sheet;
-			targetProxy = 16FCB5C221F277FA0071404B /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		16FCB5AA21F277690071404B /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -287,7 +246,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -342,7 +301,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -358,15 +317,15 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = XL2GSHMUDQ;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.tiborbodecs.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -377,15 +336,15 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = XL2GSHMUDQ;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.tiborbodecs.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -412,6 +371,13 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		166DC0C82494F18A00E75C02 /* Sheet */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = Sheet;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 16FCB59B21F277690071404B /* Project object */;
 }
diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
@@ -13,34 +13,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
+    func application(_ application: UIApplication,
+                     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+
         return true
     }
-
-    func applicationWillResignActive(_ application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-    }
-
-    func applicationDidEnterBackground(_ application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-    }
-
-    func applicationWillEnterForeground(_ application: UIApplication) {
-        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-    }
-
-    func applicationDidBecomeActive(_ application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
-
-    func applicationWillTerminate(_ application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-    }
-
-
 }
 
diff --git a/Example/Example/MySheetViewController.swift b/Example/Example/MySheetViewController.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2019. Tibor Bödecs. All rights reserved.
 //
 
+import UIKit
 import Sheet
 
 class MySheetViewController: SheetViewController {

diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,16 @@
+// swift-tools-version:5.2
+import PackageDescription
+
+let package = Package(
+    name: "Sheet",
+    platforms: [
+       .iOS(.v12),
+    ],
+    products: [
+        .library(name: "Sheet", targets: ["Sheet"]),
+    ],
+    targets: [
+        .target(name: "Sheet", dependencies: [], path: "./Sources"),
+        //.testTarget(name: "CollectionViewTests", dependencies: ["Sheet"]),
+    ]
+)
diff --git a/README.md b/README.md
@@ -2,23 +2,13 @@
 
 A discardable action sheet.
 
-## Usage
+## Installation
 
-```
-pod repo add corekit https://github.com/CoreKit/Sheet.git
-
-source 'https://github.com/CoreKit/CocoaPods.git'
-pod 'Sheet'
+### Swift Package Manager
 
 ```
+.package(url: "https://github.com/CoreKit/Sheet", from: "2.0.0"),
 
-## Pod cheatsheet
-
-```
-pod lib lint Sheet.podspec 
-git tag 1.0.0
-git push --tags
-pod repo push corekit Sheet.podspec
 ```
 
 ## License

diff --git a/Sheet.podspec b/Sheet.podspec