Merge pull request #15 from playbook-ui/chore/update-tools

chore: Update tools

Author: ra1028

.github/workflows/test.yml

@@ -7,11 +7,12 @@ on:
 jobs:
   test:
     name: Test on macOS
-    runs-on: macOS-11.0
+    runs-on: macos-11
     strategy:
       matrix:
         xcode_version:
-          - "12.2"
+          - 12.4
+          - 12.5.1
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
     steps:
@@ -21,14 +22,6 @@ jobs:
           swift --version
           xcodebuild -version
 
-      - name: Get ruby gem cache
-        id: gem-cache
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-1-gem-${{ hashFiles('Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-1-gem-
-
       - name: Get npm cache
         id: npm-cache
         uses: actions/cache@v2
@@ -37,18 +30,26 @@ jobs:
           key: ${{ runner.os }}-0-npm-${{ hashFiles('package-lock.json') }}
           restore-keys: ${{ runner.os }}-0-npm-
 
+      - name: Get ruby gem cache
+        id: gem-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-1-gem-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-1-gem-
+
       - name: Get SwiftPM cache
         uses: actions/cache@v2
         with:
           path: Tools/.build
-          key: ${{ runner.os }}-${{ matrix.xcode_version }}-2-spm-${{ hashFiles('Tools/Package.resolved') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.xcode_version }}-2-spm-
+          key: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-${{ hashFiles('Tools/Package.resolved') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-
 
       - name: Get CocoaPods cache
         id: cocoapods-cache
         uses: actions/cache@v2
         with:
-          path: Pods
+          path: Example/Pods
           key: ${{ runner.os }}-1-cocoapods-${{ hashFiles('Example/Podfile.lock') }}
           restore-keys: ${{ runner.os }}-1-cocoapods-
 
@@ -60,18 +61,18 @@ jobs:
         if: steps.gem-cache.cache.outputs.cache-hit != 'true'
         run: make gem
 
-      - name: Podspec lint
-        run: make pod-lib-lint
-
       - name: Validation
-        run: make all && [ -z "$(git status --porcelain)" ] && make lint
-        env:
-          SPM_FORCE_BUILD: 1
+        if: matrix.xcode_version == '12.5.1'
+        run: |
+          make all && [ -z "$(git status --porcelain)" ]
+          make lint
+          make pod-lib-lint
 
       - name: Generate snapshots
-        run: set -o pipefail && xcodebuild build-for-testing test-without-building -workspace Example/Example.xcworkspace -scheme SampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12 Pro' ENABLE_TESTABILITY=YES | xcpretty -c
+        run: xcodebuild test -workspace Example/Example.xcworkspace -scheme SampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12 Pro' ENABLE_TESTABILITY=YES | xcpretty -c
 
       - name: Visual regression test
+        if: matrix.xcode_version == '12.5.1'
         run: npx percy upload Example/Snapshots
         env:
           PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}

.swift-format.json renamed to .swift-format

@@ -1,4 +1,4 @@
-SWIFT_TOOL := Tools/swift-run.sh
+SWIFT_RUN := swift run -c release
 GITHUB_RAW_CONTENT_PATH := https://raw.githubusercontent.com/playbook-ui/accessibility-snapshot-ios/main/
 GITHUB_TREE_PATH := https://github.com/playbook-ui/accessibility-snapshot-ios/main/
 
@@ -7,7 +7,7 @@ all: proj format
 
 .PHONY: proj
 proj:
-	$(SWIFT_TOOL) xcodegen --spec Example/project.yml --project Example
+	$(SWIFT_RUN) --package-path Tools xcodegen --spec Example/project.yml --project Example
 	make pod-install
 
 .PHONY: pod-install
@@ -16,12 +16,11 @@ pod-install:
 
 .PHONY: format
 format:
-	$(SWIFT_TOOL) swift-mod
-	$(SWIFT_TOOL) swift-format --configuration .swift-format.json -i -r -m format Sources Example/SampleAccessibilitySnapshot
+	$(SWIFT_RUN) --package-path Tools swift-format -i -r -m format Sources Example/SampleAccessibilitySnapshot
 
 .PHONY: lint
 lint:
-	$(SWIFT_TOOL) swift-format --configuration .swift-format.json -r -m lint Sources Example/SampleAccessibilitySnapshot
+	$(SWIFT_RUN) --package-path Tools swift-format -r -m lint Sources Example/SampleAccessibilitySnapshot
 
 .PHONY: pod-lib-lint
 pod-lib-lint:
@@ -42,7 +41,7 @@ npm:
 
 .PHONY: docs
 docs:
-	$(SWIFT_TOOL) swift-doc generate Sources -n PlaybookAccessibilitySnapshot -f html -o docs --base-url https://playbook-ui.github.io/accessibility-snapshot-ios
+	$(SWIFT_RUN) --package-path Tools/Doc swift-doc generate Sources -n PlaybookAccessibilitySnapshot -f html -o docs --base-url https://playbook-ui.github.io/accessibility-snapshot-ios
 
 .PHONY: fix-readme-links
 fix-readme-links:

Makefile

@@ -0,0 +1,9 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "Doc",
+    dependencies: [
+        .package(url: "https://github.com/SwiftDocOrg/swift-doc.git", .branch("1.0.0-rc.1")),
+    ]
+)