Fix LTS CI: CocoaPods removed, XCode version updated

.circleci/config.yml

@@ -9,14 +9,11 @@ workflows:
         jobs:
             - macos-job:
                 name: SPM
-                xcode: "14.3.1" # Required for using binary frameworks with SPM
+                xcode: "15.4.0" # Required for using binary frameworks with SPM
                 spm: true
             - macos-job:
                 name: Carthage
                 carthage: true
-            - macos-job:
-                name: CocoaPods
-                cocoapods: true
     notify_release:
         jobs:
         - notify_release:
@@ -31,10 +28,7 @@ jobs:
         parameters:
             xcode:
                 type: string
-                default: "14.3.1"
-            cocoapods:
-                type: boolean
-                default: false
+                default: "15.4.0"
             carthage:
                 type: boolean
                 default: false
@@ -65,12 +59,6 @@ jobs:
                   - run:
                       name: Test Integration via Carthage
                       command: Tests/Integration/test_carthage.sh
-            - when:
-                condition: << parameters.cocoapods >>
-                steps:
-                  - run:
-                      name: Test Integration via CocoaPods
-                      command: Tests/Integration/test_cocoapods.sh
             - when:
                 condition: << parameters.spm >>
                 steps:

.github/workflows/merge_release_pr.yml

@@ -18,26 +18,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR: ${{ github.event.pull_request.html_url }}
-  re-trigger-circleci-for-cocoapods:
-    if: |
-      (startsWith(github.head_ref, 'release-v') ||
-      startsWith(github.head_ref, 'release/v') ||
-      startsWith(github.base_ref, 'main')) &&
-      startsWith(github.event.pull_request.user.login, 'mapbox-github-ci-writer-public-') &&
-      github.event.pull_request.user.id == '93400552'
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    steps:
-      - name: Rerun circleci
-        timeout-minutes: 40
-        run: |
-          # Rerun circleCI for cocoapods during 36 minutes
-          for n in {1..3};
-          do
-            sleep 720
-            curl --request POST \
-            --url https://circleci.com/api/v2/project/github/mapbox/mapbox-common-ios/pipeline \
-            --header 'Circle-Token: ${{ secrets.CCI_TOKEN }}' \
-            --header 'content-type: application/json' \
-            --data '{"branch":"${{ github.head_ref }}"}'
-          done

README.md

@@ -13,7 +13,7 @@ To learn more about these SDKs please visit their repos on GitHub and the docume
 Before you can download the Mapbox Common SDK, you need to create a token with `DOWNLOAD:READ` scope.
 Go to https://account.mapbox.com and click "Create token"
 
-##### SPM, CocoaPods and Carthage
+##### SPM and Carthage
 Insert or append the following to `~/.netrc`
 
 ```bash
@@ -41,12 +41,6 @@ machine api.mapbox.com
 .package(url: "https://github.com/mapbox/mapbox-common-ios.git", from: "23.13.1"),
 ```
 
-##### CocoaPods 📱🖥💻
-
-```ruby
-pod 'MapboxCommon', '23.13.1'
-```
-
 ##### Carthage 📱
 
 Add the following code to your Cartfile.

Tests/Integration/test_carthage.sh

@@ -7,6 +7,6 @@ pushd "${ROOT_DIR}/Tests/Integration/Carthage"
 
 xcodegen generate
 carthage update --platform iOS --use-netrc --use-xcframeworks
-xcodebuild -project CarthageTest.xcodeproj -scheme CarthageTest -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' build
+xcodebuild -project CarthageTest.xcodeproj -scheme CarthageTest -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' build
 
 popd

Tests/Integration/test_spm.sh

@@ -6,6 +6,6 @@ ROOT_DIR="${DIR}/../.."
 pushd "${ROOT_DIR}/Tests/Integration/SPM"
 
 xcodegen generate
-xcodebuild -project SPMTest.xcodeproj -scheme SPMTest -scmProvider system -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' build
+xcodebuild -project SPMTest.xcodeproj -scheme SPMTest -scmProvider system -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' build
 
 popd

scripts/release/Sources/set-marketing-version/main.swift

@@ -45,13 +45,6 @@ struct MarketingVersion: ParsableCommand {
         try content.write(toFile: url.path, atomically: true, encoding: .utf8)
     }
 
-    func runCocoaPodsVersionUpdate() throws {
-        let podfileURL = projectPathURL.appendingPathComponent("Tests/Integration/CocoaPods/Podfile")
-        try replaceLineContaining("pod 'MapboxCommon'",
-                                  with: "  pod 'MapboxCommon', '\(marketingVersion)'",
-                                  in: podfileURL)
-    }
-
     func runCarthageVersionUpdate() throws {
         let cartfileURL = projectPathURL.appendingPathComponent("Tests/Integration/Carthage/Cartfile")
         try replaceLineContaining("binary \"https://api.mapbox.com/downloads/v2/carthage/mapbox-common/",
@@ -87,7 +80,6 @@ struct MarketingVersion: ParsableCommand {
     }
 
     mutating func run() throws {
-        try runCocoaPodsVersionUpdate()
         try runCarthageVersionUpdate()
         try runSPMVersionUpdate()