Merge pull request #97 from marinofelipe/latest-xcode-toolchain

Update CI to Xcode 15
marinofelipe · Aug 31, 2024 · a711ea6 · a711ea6
2 parents a80206e + 3734e2b
commit a711ea6
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,36 +5,46 @@ on:
   workflow_dispatch:
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.head_ref }}'
+  cancel-in-progress: true
 
 jobs:
   test:
     name: "Test"
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+
       - name: Check cache for Bundler dependencies
         uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-gems-
+
       - name: Run bundle install
         run: |
           bundle config path vendor/bundle
           bundle install
+
       - name: Check cache for Swift Package Manager dependencies
         uses: actions/cache@v2
         with:
           path: .build
           key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-spm-
+
       - name: Execute fastlane `test`
         run: bundle exec fastlane test
+
       - name: Report code coverage
         uses: codecov/codecov-action@v4
+        timeout-minutes: 10
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/CurrencyText-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/CurrencyText-Package.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1230"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -154,6 +154,12 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:CurrencyText-Package.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO"

diff --git a/CurrencyText-Package.xctestplan b/CurrencyText-Package.xctestplan
@@ -0,0 +1,49 @@
+{
+  "configurations" : [
+    {
+      "id" : "0B05C04B-EDC2-4C2F-84B1-6DAB2FF7F614",
+      "name" : "Configuration 1",
+      "options" : {
+        "region" : "US"
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "language" : "en"
+  },
+  "testTargets" : [
+    {
+      "parallelizable" : true,
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "CurrencyFormatterTests",
+        "name" : "CurrencyFormatterTests"
+      }
+    },
+    {
+      "parallelizable" : true,
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "CurrencyTextFieldSnapshotTests",
+        "name" : "CurrencyTextFieldSnapshotTests"
+      }
+    },
+    {
+      "parallelizable" : true,
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "CurrencyTextFieldTests",
+        "name" : "CurrencyTextFieldTests"
+      }
+    },
+    {
+      "parallelizable" : true,
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "CurrencyUITextFieldDelegateTests",
+        "name" : "CurrencyUITextFieldDelegateTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/CurrencyText.xcworkspace/contents.xcworkspacedata b/CurrencyText.xcworkspace/contents.xcworkspacedata
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -26,7 +26,7 @@ platform :ios do
 			package_path: "", # root
 			code_coverage: true, 
 			scheme: "CurrencyText-Package", 
-			device: "iPhone 12",
+			device: "iPhone 15 Pro (17.5)",
 			result_bundle: true,
 			output_directory: "fastlane/test_output",
 			xcodebuild_formatter: is_ci ? 'xcbeautify -q --is-ci --renderer github-actions' : 'xcbeautify -q'