Merge pull request #36 from RedMadRobot/feature/package-split

Extract catbird executable product from Package.swift into CatbirdApp folder with it is own Package.swift

Author: Alexander-Ignition

.github/workflows/release.yml

@@ -13,11 +13,13 @@ jobs:
       - name: Build
         run: make release
       - name: Archive
-        run: zip -r catbird.zip catbird start.sh stop.sh LICENSE Public Resources Sources/CatbirdAPI
+        run: zip -r catbird.zip catbird start.sh stop.sh LICENSE Public Resources
+        working-directory: Packages/CatbirdApp
       - name: Upload GitHub Release Assets
         run: gh release upload ${{ github.event.release.tag_name }} catbird.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: Packages/CatbirdApp
       - name: Install Cocoapods
         run: bundle install
       - name: Deploy to Cocoapods

.github/workflows/test.yml

@@ -19,4 +19,3 @@ jobs:
         uses: actions/checkout@v2
       - name: Build and test
         run: make test
-        shell: bash

.gitignore

@@ -1,4 +1,3 @@
-Packages
 .build
 xcuserdata
 Catbird.xcodeproj

Makefile

@@ -1,16 +1,14 @@
 test:
-	swift test --enable-code-coverage --disable-automatic-resolution
-	xcrun llvm-cov report \
-		.build/x86_64-apple-macosx/debug/CatbirdPackageTests.xctest/Contents/MacOS/CatbirdPackageTests \
-		-instr-profile=.build/x86_64-apple-macosx/debug/codecov/default.profdata \
-		-ignore-filename-regex=".build|Tests"
-
+	$(call test)
+	$(call cov_report,Catbird)
+	cd Packages/CatbirdApp; $(call test)
+	cd Packages/CatbirdApp; $(call cov_report,CatbirdApp)
 build:
 	swift build
 
 release:
-	swift build -c release
-	cp ./.build/x86_64-apple-macosx/release/catbird ./catbird
+	cd Packages/CatbirdApp; swift build -c release
+	cd Packages/CatbirdApp; cp ./.build/release/catbird ./catbird
 
 update:
 	swift package update
@@ -20,3 +18,14 @@ clean:
 
 lint:
 	bundle exec pod spec lint
+
+define test
+    swift test --enable-code-coverage --disable-automatic-resolution
+endef
+
+define cov_report
+    xcrun llvm-cov report \
+		.build/debug/$(1)PackageTests.xctest/Contents/MacOS/$(1)PackageTests \
+		-instr-profile=.build/debug/codecov/default.profdata \
+		-ignore-filename-regex=".build|Tests"
+endef

Package.swift

@@ -4,40 +4,15 @@ import PackageDescription
 let package = Package(
     name: "Catbird",
     platforms: [
-       .macOS(.v10_15)
+        .iOS(.v12),
+        .macOS(.v10_15)
     ],
     products: [
-        .library(name: "CatbirdAPI", targets: ["CatbirdAPI"]),
-        .executable(name: "catbird", targets: ["CatbirdRun"]),
-    ],
-    dependencies: [
-        // 💧 A server-side Swift web framework.
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
-
-        // Templete engine
-        .package(url: "https://github.com/stencilproject/Stencil.git", from: "0.14.0"),
-
-        // macOS system logger
-        .package(url: "https://github.com/Alexander-Ignition/OSLogging", from: "1.0.0"),
+        .library(name: "CatbirdAPI", targets: ["CatbirdAPI"])
     ],
     targets: [
         // Common API
-        .target(name: "CatbirdAPI"),
-        .testTarget(name: "CatbirdAPITests", dependencies: ["CatbirdAPI"]),
-
-        // Web Server
-        .target(name: "CatbirdApp", dependencies: [
-            .target(name: "CatbirdAPI"),
-            .product(name: "Vapor", package: "vapor"),
-            .product(name: "Stencil", package: "Stencil"),
-            .product(name: "OSLogging", package: "OSLogging"),
-        ]),
-        .testTarget(name: "CatbirdAppTests", dependencies: [
-            .target(name: "CatbirdApp"),
-            .product(name: "XCTVapor", package: "vapor"),
-        ]),
-
-        // CLI
-        .target(name: "CatbirdRun", dependencies: ["CatbirdApp"]),
+        .target(name: "CatbirdAPI", path: "Packages/CatbirdAPI/Sources"),
+        .testTarget(name: "CatbirdAPITests", dependencies: ["CatbirdAPI"], path: "Packages/CatbirdAPI/Tests")
     ]
 )