Merge pull request #43 from akkyie/update-project

Update project

Author: akkyie

.github/workflows/test.yml

@@ -16,7 +16,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - run: make lint/xcode
       - uses: mxcl/xcodebuild@v1
         with:
           swift: ${{ matrix.swift }}
@@ -31,3 +30,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: make test/spm
+
+  lint_xcodeproj:
+    runs-on: macos-11
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/cache@v2
+        with:
+          path: .build
+          key: ${{ runner.os }}-${{ hashFiles('Package.resolved') }}
+      - uses: mxcl/xcodebuild@v1
+        with:
+          xcode: 12.5.1
+          action: none
+      - run: make xcodeproj && make lint/xcodeproj

.travis.yml

@@ -7,4 +7,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10
 TVOS_DEPLOYMENT_TARGET = 9.0
 
 // XCTest doesn't include bitcode
-ENABLE_BITCODE=NO
+ENABLE_BITCODE=NO
+
+// Allows linking against XCTest
+ENABLE_TESTING_SEARCH_PATHS=YES

Configs/SwiftPM.xcconfig

@@ -35,21 +35,18 @@ test/docker: clean/spm linuxmain
 .PHONY: xcodeproj
 xcodeproj: $(PROJECT)
 $(PROJECT): .FORCE
-	swift package generate-xcodeproj --enable-code-coverage --xcconfig-overrides $(XCCONFIG)
-	@echo "warn: Don't forget to remove ./Examples from the project."
+	swift package generate-xcodeproj \
+		--enable-code-coverage \
+		--skip-extra-files \
+		--xcconfig-overrides $(XCCONFIG)
 
 .PHONY: linuxmain
 linuxmain:
 	swift test --generate-linuxmain
 
-GREP_EXAMPLES_RESULT = $(shell grep "Examples" $(PROJECT)/project.pbxproj)
-.PHONY: lint/xcode
-lint/xcode:
-ifeq ($(GREP_EXAMPLES_RESULT),)
-	@ echo "OK: Examples directory was not found in the project"
-else
-	$(error Remove Examples directory from the project)
-endif
+.PHONY: lint/xcodeproj
+lint/xcodeproj:
+	./Scripts/check_xcodeproj_diff.sh
 
 LATEST_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`)
 

Makefile

@@ -10,7 +10,9 @@ let package = Package(
             targets: ["Tablier"]
         ),
     ],
-    dependencies: [],
+    dependencies: [
+        .package(url: "https://github.com/bloomberg/xcdiff", .upToNextMinor(from: "0.7.0")),
+    ],
     targets: [
         .target(
             name: "Tablier",

Package.resolved

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+PROJECT_ROOT=$(dirname "$0")/..
+XCODEPROJ=$PROJECT_ROOT/Tablier.xcodeproj
+
+TMPPROJ=$(mktemp -d)
+
+XCDIFF="swift run -c release xcdiff"
+
+echo "Changes after project generation:"
+if git diff --exit-code --name-only -- $XCODEPROJ ; then
+    echo "No change found."
+    exit 0;
+fi
+
+rsync -a $XCODEPROJ/ $TMPPROJ/
+
+git checkout -- $XCODEPROJ
+
+function cleanup {
+    echo "Cleaning up..."
+    rsync -a $TMPPROJ/ $XCODEPROJ/
+    rm -rf $TMPPROJ
+}
+
+trap cleanup EXIT
+
+if $XCDIFF -t "Tablier" -g "settings" -p1 $XCODEPROJ -p2 $TMPPROJ ; then
+    exit 0;
+fi
+
+exit 1;