Merge branch 'feature/current-package-revision' into develop

Author: bcylin

.github/workflows/ci.yml

@@ -5,31 +5,40 @@ jobs:
   run-tests:
     name: Run tests
     runs-on: macOS-latest
+    env:
+      BUNDLE_PATH: vendor/bundle
+      POD_PATH: Pods
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-ruby@v1
+      - uses: actions/setup-ruby@v1.1.2
         with:
           ruby-version: '2.6.x'
-      - uses: actions/cache@v1
+
+      # Cache
+      - name: Cache ${{ env.BUNDLE_PATH }}
+        uses: actions/cache@v2.1.1
         with:
-          path: vendor/bundle
+          path: ${{ env.BUNDLE_PATH }}
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: ${{ runner.os }}-gems-
-      - uses: actions/cache@v1
+      - name: Cache ${{ env.POD_PATH }}
+        uses: actions/cache@v2.1.1
         with:
-          path: Pods
+          path: ${{ env.POD_PATH }}
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
           restore-keys: ${{ runner.os }}-pods-
+
+      # Dependencies
       - name: Bundle install
         run: |
-          gem install bundler:2.1.4
-          bundle config path vendor/bundle
+          gem install bundler -v `tail -1 Gemfile.lock`
+          bundle config path ${{ env.BUNDLE_PATH }}
           bundle install --jobs 4 --retry 3
       - name: Pod install
         run: |
           bundle exec pod install
-      - run: |
-          bundler exec fastlane swift_package
+
+      # Tests
       - run: |
           bundle exec fastlane ios unit_tests
       - run: |

.gitignore

@@ -35,5 +35,5 @@ Pods/
 ## Carthage
 Carthage/
 
-## Packages with local file paths
-**/xcshareddata/swiftpm/Package.resolved
+## Swift Package tests
+Package.xcodeproj

.travis.yml

@@ -1,14 +1,21 @@
 language: objective-c
 osx_image: xcode11.3
 cache:
-  - bundler
+  directories:
+    - vendor/bundle
+    - vendor/mint
 before_install:
   - export LANG=en_US.UTF-8
   - xcrun instruments -s devices
 install:
+  - bundle config path vendor/bundle
   - bundle install --without development --deployment --jobs=3 --retry=3
+  - brew list mint > /dev/null || brew install mint
+  - mint bootstrap
 script:
   - set -e
+  - mint run yonaskolb/XcodeGen xcodegen generate --project Package --spec Package/Package.yml
+  - bundler exec fastlane swift_package
   - make -B carthage
   - make -B docs
 after_success:

Makefile

@@ -14,6 +14,11 @@ ci-test: unit-test ui-test
 	make -B carthage
 	make -B docs
 
+swift-package-project:
+	rm -rf Package/Package.xcproj
+	mint run yonaskolb/XcodeGen xcodegen generate --project Package --spec Package/Package.yml
+	open Package/Package.xcodeproj
+
 bump:
 ifeq (,$(strip $(version)))
 	# Usage: make bump version=<number>

Mintfile

@@ -0,0 +1 @@
+yonaskolb/XcodeGen@2.18.0