Restructure for SPM

infinitetoken · Jun 4, 2019 · 8e346b4 · 8e346b4
1 parent 39e20f5
commit 8e346b4
Show file tree

Hide file tree

Showing 46 changed files with 199 additions and 244 deletions.
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,36 @@
+// swift-tools-version:5.0
+//
+//  Package.swift
+//  Lumber
+//
+//  Created by Aaron Wright on 5/1/18.
+//  Copyright © 2018 Aaron Wright. All rights reserved.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "Token",
+    platforms: [
+        .macOS(.v10_12),
+        .iOS(.v10),
+        .tvOS(.v10),
+        .watchOS(.v3)
+    ],
+    products: [
+        .library(
+            name: "Token",
+            targets: ["Token"])
+    ],
+    targets: [
+        .target(
+            name: "Token",
+            path: "Sources"),
+        .testTarget(
+            name: "TokenTests",
+            dependencies: ["Token"],
+            path: "Tests"),
+    ],
+    swiftLanguageVersions: [.v5]
+)
+
diff --git a/TokenShared/Action.swift → Sources/Action.swift b/TokenShared/Action.swift → Sources/Action.swift
diff --git a/TokenShared/ActionCreator.swift → Sources/ActionCreator.swift b/TokenShared/ActionCreator.swift → Sources/ActionCreator.swift
diff --git a/TokenShared/Array+Appending.swift → Sources/Array+Appending.swift b/TokenShared/Array+Appending.swift → Sources/Array+Appending.swift
diff --git a/TokenShared/Array+Cacheable.swift → Sources/Array+Cacheable.swift b/TokenShared/Array+Cacheable.swift → Sources/Array+Cacheable.swift
diff --git a/TokenShared/ArrayReducer.swift → Sources/ArrayReducer.swift b/TokenShared/ArrayReducer.swift → Sources/ArrayReducer.swift
diff --git a/TokenShared/Cache.swift → Sources/Cache.swift b/TokenShared/Cache.swift → Sources/Cache.swift
diff --git a/TokenShared/CacheAction.swift → Sources/CacheAction.swift b/TokenShared/CacheAction.swift → Sources/CacheAction.swift
diff --git a/TokenShared/CacheReducer.swift → Sources/CacheReducer.swift b/TokenShared/CacheReducer.swift → Sources/CacheReducer.swift
diff --git a/TokenShared/Cacheable.swift → Sources/Cacheable.swift b/TokenShared/Cacheable.swift → Sources/Cacheable.swift
diff --git a/TokenShared/IndexSet+Inserting.swift → Sources/IndexSet+Inserting.swift b/TokenShared/IndexSet+Inserting.swift → Sources/IndexSet+Inserting.swift
diff --git a/Token/Info.plist → Sources/Info.plist b/Token/Info.plist → Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.6</string>
+	<string>1.4.7</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/TokenShared/Middleware.swift → Sources/Middleware.swift b/TokenShared/Middleware.swift → Sources/Middleware.swift
diff --git a/TokenShared/Reducer.swift → Sources/Reducer.swift b/TokenShared/Reducer.swift → Sources/Reducer.swift
diff --git a/TokenShared/State+Mutated.swift → Sources/State+Mutated.swift b/TokenShared/State+Mutated.swift → Sources/State+Mutated.swift
diff --git a/TokenShared/State.swift → Sources/State.swift b/TokenShared/State.swift → Sources/State.swift
diff --git a/TokenShared/Store.swift → Sources/Store.swift b/TokenShared/Store.swift → Sources/Store.swift
diff --git a/TokenShared/Subscriber.swift → Sources/Subscriber.swift b/TokenShared/Subscriber.swift → Sources/Subscriber.swift
diff --git a/Token/Token.h → Sources/Token.h b/Token/Token.h → Sources/Token.h
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Aaron Wright. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+@import Foundation;
 
 //! Project version number for Token.
 FOUNDATION_EXPORT double TokenVersionNumber;

diff --git a/TokenShared/Token.swift → Sources/Token.swift b/TokenShared/Token.swift → Sources/Token.swift
diff --git a/TokenTestsShared/ArrayAppendingTests.swift → Tests/ArrayAppendingTests.swift b/TokenTestsShared/ArrayAppendingTests.swift → Tests/ArrayAppendingTests.swift
diff --git a/TokenTestsShared/ArrayCacheableTests.swift → Tests/ArrayCacheableTests.swift b/TokenTestsShared/ArrayCacheableTests.swift → Tests/ArrayCacheableTests.swift
diff --git a/TokenTestsShared/CacheActionTests.swift → Tests/CacheActionTests.swift b/TokenTestsShared/CacheActionTests.swift → Tests/CacheActionTests.swift
diff --git a/TokenTestsShared/CacheReducerTests.swift → Tests/CacheReducerTests.swift b/TokenTestsShared/CacheReducerTests.swift → Tests/CacheReducerTests.swift
diff --git a/TokenTestsShared/CacheTests.swift → Tests/CacheTests.swift b/TokenTestsShared/CacheTests.swift → Tests/CacheTests.swift
diff --git a/...nTestsShared/IndexSetInsertingTests.swift → Tests/IndexSetInsertingTests.swift b/...nTestsShared/IndexSetInsertingTests.swift → Tests/IndexSetInsertingTests.swift
diff --git a/TokenMobileTests/Info.plist → Tests/Info.plist b/TokenMobileTests/Info.plist → Tests/Info.plist
diff --git a/TokenTestsShared/StateMutatedTests.swift → Tests/StateMutatedTests.swift b/TokenTestsShared/StateMutatedTests.swift → Tests/StateMutatedTests.swift
diff --git a/TokenTestsShared/TestAction.swift → Tests/TestAction.swift b/TokenTestsShared/TestAction.swift → Tests/TestAction.swift
diff --git a/TokenTestsShared/TestActionCreator.swift → Tests/TestActionCreator.swift b/TokenTestsShared/TestActionCreator.swift → Tests/TestActionCreator.swift
diff --git a/TokenTestsShared/TestError.swift → Tests/TestError.swift b/TokenTestsShared/TestError.swift → Tests/TestError.swift
diff --git a/...tsShared/TestMiddlewareActionChange.swift → Tests/TestMiddlewareActionChange.swift b/...tsShared/TestMiddlewareActionChange.swift → Tests/TestMiddlewareActionChange.swift
diff --git a/TokenTestsShared/TestReducer.swift → Tests/TestReducer.swift b/TokenTestsShared/TestReducer.swift → Tests/TestReducer.swift
diff --git a/TokenTestsShared/TestState.swift → Tests/TestState.swift b/TokenTestsShared/TestState.swift → Tests/TestState.swift
diff --git a/TokenTestsShared/TestSubscriber.swift → Tests/TestSubscriber.swift b/TokenTestsShared/TestSubscriber.swift → Tests/TestSubscriber.swift
diff --git a/...hared/TestSubscriberWithoutOnChange.swift → Tests/TestSubscriberWithoutOnChange.swift b/...hared/TestSubscriberWithoutOnChange.swift → Tests/TestSubscriberWithoutOnChange.swift
diff --git a/TokenTestsShared/TestWidget.swift → Tests/TestWidget.swift b/TokenTestsShared/TestWidget.swift → Tests/TestWidget.swift
diff --git a/TokenTestsShared/TokenTests.swift → Tests/TokenTests.swift b/TokenTestsShared/TokenTests.swift → Tests/TokenTests.swift
diff --git a/Token.xcodeproj/project.pbxproj b/Token.xcodeproj/project.pbxproj
diff --git a/Token.xcodeproj/xcuserdata/acwrightdesign.xcuserdatad/xcschemes/xcschememanagement.plist b/Token.xcodeproj/xcuserdata/acwrightdesign.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -19,6 +19,11 @@
 			<key>orderHint</key>
 			<integer>2</integer>
 		</dict>
+		<key>TokenWatch.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/TokenMobile/Info.plist b/TokenMobile/Info.plist
diff --git a/TokenMobile/TokenMobile.h b/TokenMobile/TokenMobile.h
diff --git a/TokenTV/Info.plist b/TokenTV/Info.plist
diff --git a/TokenTV/TokenTV.h b/TokenTV/TokenTV.h
diff --git a/TokenTVTests/Info.plist b/TokenTVTests/Info.plist
diff --git a/TokenTests/Info.plist b/TokenTests/Info.plist