Updates (#35)

* 🚚 Migrate to SPM structure

* 🔧 Bump deployment target to iOS 11

* 🔧 Enable library evolution

* 🔧 Update CI jobs

* 📝 Update CHANGELOG

Author: olejnjak

.github/workflows/checks.yml

@@ -8,14 +8,14 @@ jobs:
     name: Swiftlint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.5.0
       - name: GitHub Action for SwiftLint
         uses: norio-nomura/[email protected]
   changelog:
     name: Changelog
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.5.0
       - name: Changelog Reminder
         uses: peterjgrainger/[email protected]
         with:
@@ -26,6 +26,6 @@ jobs:
     name: Podspec
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.5.0
       - name: Lint podspec
         run: pod lib lint

.github/workflows/deploy.yml

@@ -6,40 +6,36 @@ on:
     - '*'
 
 jobs:
-  # Just comment out for now, uncomment when Carthage supports archives with XCFrameworks
-  # carthage:
-  #   name: Upload Carthage binary 
-  #   runs-on: macos-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: AckeeCZ/[email protected]
-  #     - uses: actions/cache@v1
-  #       with:
-  #         path: Carthage
-  #         key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-carthage-
-  #     - name: Build
-  #       run: carthage build --no-skip-current --cache-builds
-  #     - name: Archive
-  #       run: carthage archive Reqres
-  #     - uses: xresloader/upload-to-github-release@v1
-  #       if: startsWith(github.ref, 'refs/tags/')
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #       with:
-  #         file: Reqres.framework.zip
-  #         tags: true
-  #         draft: false
+  carthage:
+    name: Upload Carthage binary 
+    runs-on: macos-latest
+    steps:
+      - uses: actions/[email protected]
+      - uses: AckeeCZ/[email protected]
+      - name: Build
+        run: carthage build --no-skip-current --cache-builds --use-xcframeworks
+      - name: Archive
+        run: | 
+          DST=$PWD
+          mkdir -p /tmp/Reqres
+          mv Carthage/Build/*.xcframework /tmp/Reqres
+          cd /tmp
+          zip -r "$DST/"Reqres.xcframework.zip Reqres
+      - uses: xresloader/upload-to-github-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          file: Reqres.xcframework.zip
+          tags: true
+          draft: false
   cocoapods:
     name: Push podspec to Cocoapods trunk
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: AckeeCZ/[email protected]
-      - name: Install gems
-        run: bundle install
+      - uses: actions/[email protected]
+      - uses: AckeeCZ/[email protected]
       - name: Push podspec
-        run: bundle exec pod trunk push --allow-warnings
+        run: pod trunk push --allow-warnings
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.5.0
       - name: Generate Documentation
         uses: SwiftDocOrg/swift-doc@master
         with:

.github/workflows/tests.yml

@@ -7,17 +7,7 @@ jobs:
     name: Run tests
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: AckeeCZ/[email protected]
-      - uses: actions/cache@v1
-        with:
-          path: Carthage
-          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-carthage-
-      - name: Install Carthage dependencies
-        env:
-          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: carthage bootstrap --platform iOS --cache-builds --use-xcframeworks
+      - uses: actions/[email protected]
+      - uses: AckeeCZ/[email protected]
       - name: Run tests
-        run: set -o pipefail && xcodebuild test -scheme Reqres -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11 Pro Max,OS=latest' ONLY_ACTIVE_ARCH=YES | xcpretty
+        run: swift test

.github/xcode-version

@@ -1 +1 @@
-12.4
+14.2

.swiftlint.yml

@@ -1,4 +1,4 @@
-whitelist_rules:
+only_rules:
   - class_delegate_protocol
   - closing_brace
   - colon
@@ -16,7 +16,7 @@ whitelist_rules:
   - weak_delegate
   - overridden_super_call
 included: # paths to include during linting. `--path` is ignored if present.
-  - Reqres
+  - Sources
 excluded: # paths to ignore during linting. Takes precedence over `included`.
   - Carthage
   - Pods

CHANGELOG.md

@@ -7,13 +7,16 @@
 - <description> (#<PR_number>, kudos to @<author>)
 ```
 
-## master
+## main
 
 ### Added
 <!--- - <description> (#<PR_number, kudos to @<author>) --->
 - Run SwiftLint on build if installed locally ([#29](https://github.com/AckeeCZ/Reqres/pull/29), kudos to @olejnjak)
 
 ### Changed
+- Update structure ([#35](https://github.com/AckeeCZ/Reqres/pull/35), kudos to @olejnjak)
+    - use Xcode 14.3
+    - bump deployment target to iOS 11
 - Use Xcode 12.4 on CI ([#31](https://github.com/AckeeCZ/Reqres/pull/31), kudos to @olejnjak)
 
 ## 3.1.1

Cartfile.private

@@ -4,16 +4,17 @@ import PackageDescription
 let package = Package(
     name: "Reqres",
     platforms: [
-        .iOS(.v9),
+        .iOS(.v11),
         .macOS(.v10_12)
     ],
     products: [
         .library(name: "Reqres", targets: ["Reqres"]),
     ],
     targets: [
-        .target(name: "Reqres", path: "Reqres")
-    ],
-    swiftLanguageVersions: [
-        .v5
+        .target(name: "Reqres"),
+        .testTarget(
+            name: "ReqresTests",
+            dependencies: ["Reqres"]
+        )
     ]
 )

Cartfile.resolved

@@ -9,7 +9,7 @@ Logs every request app makes, works great with Alamofire.
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Ackee' => '[email protected]' }
   s.source           = { :git => 'https://github.com/AckeeCZ/Reqres.git', :tag => s.version.to_s }
-  s.ios.deployment_target = '8.0'
-  s.swift_version    = '5.1'
-  s.source_files = 'Reqres/*.swift'
+  s.ios.deployment_target = '11.0'
+  s.swift_version    = '5.0'
+  s.source_files = 'Sources/Reqres/*.swift'
 end