fix package.swift

lexrus · Sep 20, 2020 · afbe07c · afbe07c
1 parent 3de24d5
commit afbe07c
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 225 deletions.
diff --git a/LTMorphingLabelDemo.xcodeproj/project.pbxproj b/LTMorphingLabelDemo.xcodeproj/project.pbxproj
@@ -371,9 +371,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		D73DFD001F4DB5CC00F84122 /* LTMorphingLabel_tvOS */ = {
+		D73DFD001F4DB5CC00F84122 /* MorphingLabel_tvOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D73DFD171F4DB5CC00F84122 /* Build configuration list for PBXNativeTarget "LTMorphingLabel_tvOS" */;
+			buildConfigurationList = D73DFD171F4DB5CC00F84122 /* Build configuration list for PBXNativeTarget "MorphingLabel_tvOS" */;
 			buildPhases = (
 				D73DFD011F4DB5CC00F84122 /* Sources */,
 				D73DFD0F1F4DB5CC00F84122 /* Frameworks */,
@@ -384,7 +384,7 @@
 			);
 			dependencies = (
 			);
-			name = LTMorphingLabel_tvOS;
+			name = MorphingLabel_tvOS;
 			productName = LTMorphingLabel;
 			productReference = D73DFD1A1F4DB5CC00F84122 /* MorphingLabel.framework */;
 			productType = "com.apple.product-type.framework";
@@ -447,9 +447,9 @@
 			productReference = D7934DC61A63AF1100AE04CE /* LTMorphingLabelTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		D7D4B01E1A5E87D50087F83D /* LTMorphingLabel */ = {
+		D7D4B01E1A5E87D50087F83D /* MorphingLabel */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D7D4B03D1A5E87D50087F83D /* Build configuration list for PBXNativeTarget "LTMorphingLabel" */;
+			buildConfigurationList = D7D4B03D1A5E87D50087F83D /* Build configuration list for PBXNativeTarget "MorphingLabel" */;
 			buildPhases = (
 				D7D4B01A1A5E87D50087F83D /* Sources */,
 				D7D4B01B1A5E87D50087F83D /* Frameworks */,
@@ -460,7 +460,7 @@
 			);
 			dependencies = (
 			);
-			name = LTMorphingLabel;
+			name = MorphingLabel;
 			productName = LTMorphingLabel;
 			productReference = D7D4B01F1A5E87D50087F83D /* MorphingLabel.framework */;
 			productType = "com.apple.product-type.framework";
@@ -512,9 +512,9 @@
 			projectRoot = "";
 			targets = (
 				D74AD96D195171E7009A2ACD /* LTMorphingLabelDemo */,
-				D7D4B01E1A5E87D50087F83D /* LTMorphingLabel */,
+				D7D4B01E1A5E87D50087F83D /* MorphingLabel */,
 				D7934DC51A63AF1100AE04CE /* LTMorphingLabelTests */,
-				D73DFD001F4DB5CC00F84122 /* LTMorphingLabel_tvOS */,
+				D73DFD001F4DB5CC00F84122 /* MorphingLabel_tvOS */,
 				D73DFD1F1F5056A700F84122 /* LTMorphingLabelUITests */,
 			);
 		};
@@ -586,7 +586,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -675,17 +675,17 @@
 /* Begin PBXTargetDependency section */
 		D72A94DE1F7CAF6D007E5157 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D7D4B01E1A5E87D50087F83D /* LTMorphingLabel */;
+			target = D7D4B01E1A5E87D50087F83D /* MorphingLabel */;
 			targetProxy = D72A94DD1F7CAF6D007E5157 /* PBXContainerItemProxy */;
 		};
 		D72A94E31F7CAFAA007E5157 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D7D4B01E1A5E87D50087F83D /* LTMorphingLabel */;
+			target = D7D4B01E1A5E87D50087F83D /* MorphingLabel */;
 			targetProxy = D72A94E21F7CAFAA007E5157 /* PBXContainerItemProxy */;
 		};
 		D73C19F91AC2823900C1A824 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D7D4B01E1A5E87D50087F83D /* LTMorphingLabel */;
+			target = D7D4B01E1A5E87D50087F83D /* MorphingLabel */;
 			targetProxy = D73C19F81AC2823900C1A824 /* PBXContainerItemProxy */;
 		};
 		D73C19FC1AC28DAA00C1A824 /* PBXTargetDependency */ = {
@@ -1065,7 +1065,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		D73DFD171F4DB5CC00F84122 /* Build configuration list for PBXNativeTarget "LTMorphingLabel_tvOS" */ = {
+		D73DFD171F4DB5CC00F84122 /* Build configuration list for PBXNativeTarget "MorphingLabel_tvOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D73DFD181F4DB5CC00F84122 /* Debug */,
@@ -1110,7 +1110,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D7D4B03D1A5E87D50087F83D /* Build configuration list for PBXNativeTarget "LTMorphingLabel" */ = {
+		D7D4B03D1A5E87D50087F83D /* Build configuration list for PBXNativeTarget "MorphingLabel" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D7D4B0391A5E87D50087F83D /* Debug */,

diff --git a/...o.xcodeproj/project.xcworkspace/xcuserdata/lex.xcuserdatad/UserInterfaceState.xcuserstate b/...o.xcodeproj/project.xcworkspace/xcuserdata/lex.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabel.xcscheme b/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabel.xcscheme
diff --git a/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabel_tvOS.xcscheme b/LTMorphingLabelDemo.xcodeproj/xcshareddata/xcschemes/LTMorphingLabel_tvOS.xcscheme
diff --git a/LTMorphingLabelDemo.xcodeproj/xcuserdata/lex.xcuserdatad/xcschemes/xcschememanagement.plist b/LTMorphingLabelDemo.xcodeproj/xcuserdata/lex.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,11 +4,6 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>LTMorphingLabel.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
 		<key>LTMorphingLabelDemo.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
@@ -19,7 +14,12 @@
 			<key>orderHint</key>
 			<integer>1</integer>
 		</dict>
-		<key>LTMorphingLabel_tvOS.xcscheme_^#shared#^_</key>
+		<key>MorphingLabel.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>MorphingLabel_tvOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>2</integer>

diff --git a/LTMorphingLabelTests/LTMorphingLabelTests.swift b/LTMorphingLabelTests/LTMorphingLabelTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import LTMorphingLabel
+import MorphingLabel
 
 class LTMorphingLabelTests : XCTestCase {
 

diff --git a/LTMorphingLabelUITests/LTMorphingLabelUITests.swift b/LTMorphingLabelUITests/LTMorphingLabelUITests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import LTMorphingLabel
+import MorphingLabel
 
 class LTMorphingLabelUITests: XCTestCase {
 

diff --git a/Package.swift b/Package.swift
@@ -2,21 +2,25 @@
 import PackageDescription
 
 let package = Package(
-    name: "LTMorphingLabel",
+    name: "MorphingLabel",
     products: [
-        .library(name: "LTMorphingLabel", targets: ["LTMorphingLabel"]),
-        .library(name: "LTMorphingLabelXCFramework", targets: ["LTMorphingLabelXCFramework"])
+        .library(name: "MorphingLabel", targets: ["MorphingLabel"]),
+        .library(name: "MorphingLabelDynamic", type: .dynamic, targets: ["MorphingLabel"]),
+        .library(name: "MorphinglabelXCFramework", targets: ["LTMorphingLabel"])
     ],
     targets: [
         .target(
-            name: "LTMorphingLabel",
+            name: "MorphingLabel",
             path: "LTMorphingLabel",
-            exclude: ["LTMorphingLabel/SwiftUI/MorphingText.swift"]
+            exclude: ["SwiftUI"],
+            resources: [
+                .process("Particles/*.png")
+            ]
         ),
-        .target(
-            name: "LTMorphingLabelXCFramework",
-            url: "https://github.com/lexrus/LTMorphingLabel/releases/download/0.9.1/LTMorphingLabel.framework.zip",
-            checksum: "c40d71025beb8be5855cf78c0a4ab8d16762d183adce2b5196cff3d3a3c65c2e"
+        .binaryTarget(
+            name: "LTMorphingLabel",
+            url: "https://github.com/lexrus/LTMorphingLabel/releases/download/0.9.2/LTMorphingLabel.xcframework.zip",
+            checksum: "a3a12be1e08b84b7d9a1dd99806bc524b4515c277794d325155bb6e06ed2584a"
         )
     ]
 )
diff --git a/README.md b/README.md
@@ -63,13 +63,11 @@ public var body: some View {
 
 1. File > Swift Packages > Add Package Dependency
 2. Copy & paste `https://github.com/lexrus/LTMorphingLabel` then follow the instruction
-3. Select the source framework or the xcframework
 
 ### [XCFramework](https://developer.apple.com/videos/play/wwdc2019/416/)
 
-XCFramework is a new option intruduced in Xcode 11.
-Download the pre-compiled LTMorphingLabel.xcframework.zip from the [Releases](https://github.com/lexrus/LTMorphingLabel/releases) page.
-You may also use the binaryTarget of Swift Package Manager with Xcode 12.
+XCFramework is a new option introduced in Xcode 11.
+You can manually download the pre-compiled LTMorphingLabel.xcframework.zip from the [Releases](https://github.com/lexrus/LTMorphingLabel/releases) page. Then drag and drop it into your project.
 
 ### [Carthage](https://github.com/Carthage/Carthage)