From 44f21183f6ce54f6f8d1c08cef2acc09140929e2 Mon Sep 17 00:00:00 2001 From: Tatiana Ian Date: Wed, 4 Nov 2026 13:35:45 +0200 Subject: [PATCH 1/2] [ci] remove CocoaPods as we do not publish CocoaPods releases anymore. --- .github/workflows/merge_release_pr.yml | 23 -------- README.md | 8 +-- Tests/Integration/CocoaPods/.gitignore | 5 -- Tests/Integration/CocoaPods/Gemfile | 8 --- Tests/Integration/CocoaPods/Podfile | 5 -- .../CocoaPods/Sources/AppDelegate.swift | 13 ----- .../Integration/CocoaPods/Sources/Info.plist | 57 ------------------- Tests/Integration/CocoaPods/project.yml | 16 ------ Tests/Integration/test_cocoapods.sh | 14 ----- .../Sources/set-marketing-version/main.swift | 8 --- 10 files changed, 1 insertion(+), 156 deletions(-) delete mode 100644 Tests/Integration/CocoaPods/.gitignore delete mode 100644 Tests/Integration/CocoaPods/Gemfile delete mode 100644 Tests/Integration/CocoaPods/Podfile delete mode 100644 Tests/Integration/CocoaPods/Sources/AppDelegate.swift delete mode 100644 Tests/Integration/CocoaPods/Sources/Info.plist delete mode 100644 Tests/Integration/CocoaPods/project.yml delete mode 100755 Tests/Integration/test_cocoapods.sh diff --git a/.github/workflows/merge_release_pr.yml b/.github/workflows/merge_release_pr.yml index 317581b2..375381d2 100644 --- a/.github/workflows/merge_release_pr.yml +++ b/.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 diff --git a/README.md b/README.md index 2b6b79a4..921efca6 100644 --- a/README.md +++ b/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. diff --git a/Tests/Integration/CocoaPods/.gitignore b/Tests/Integration/CocoaPods/.gitignore deleted file mode 100644 index 87b094c5..00000000 --- a/Tests/Integration/CocoaPods/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.xcodeproj -*.xcworkspace -Pods/ -Podfile.lock -Gemfile.lock diff --git a/Tests/Integration/CocoaPods/Gemfile b/Tests/Integration/CocoaPods/Gemfile deleted file mode 100644 index 16da4dca..00000000 --- a/Tests/Integration/CocoaPods/Gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# concurrent-ruby 1.3.5 causes the following error: https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror -gem 'concurrent-ruby', '1.3.4' - -gem 'cocoapods' -# activesupport-7.1.0 causes the following error: https://app.circleci.com/pipelines/github/mapbox/mapbox-common-ios/698/workflows/41765281-efa2-44f7-ae02-dfeb308224f4/jobs/1891 -gem 'activesupport', '7.0.8' diff --git a/Tests/Integration/CocoaPods/Podfile b/Tests/Integration/CocoaPods/Podfile deleted file mode 100644 index 4150deb3..00000000 --- a/Tests/Integration/CocoaPods/Podfile +++ /dev/null @@ -1,5 +0,0 @@ -platform :ios, '11.0' - -target 'PodInstall' do - pod 'MapboxCommon', '23.13.1' -end diff --git a/Tests/Integration/CocoaPods/Sources/AppDelegate.swift b/Tests/Integration/CocoaPods/Sources/AppDelegate.swift deleted file mode 100644 index 1ffff48f..00000000 --- a/Tests/Integration/CocoaPods/Sources/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import UIKit -import MapboxCommon - - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - var window: UIWindow? - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - assert(ValueConverter.toJson(forValue: 0) == "0") - return true - } -} diff --git a/Tests/Integration/CocoaPods/Sources/Info.plist b/Tests/Integration/CocoaPods/Sources/Info.plist deleted file mode 100644 index f9049463..00000000 --- a/Tests/Integration/CocoaPods/Sources/Info.plist +++ /dev/null @@ -1,57 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - $(PRODUCT_NAME) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.0.2 - CFBundleSignature - MBGL - CFBundleVersion - 7877 - LSRequiresIPhoneOS - - MGLMapboxAccessToken - $(MAPBOX_ACCESS_TOKEN) - NSHumanReadableCopyright - © 2014–2020 Mapbox - NSLocationAlwaysAndWhenInUseUsageDescription - The map will display your location. If you choose Always, the map may also use your location when it isn’t visible in order to improve OpenStreetMap and Mapbox products. - NSLocationAlwaysUsageDescription - The map will display your location. The map may also use your location when it isn’t visible in order to improve OpenStreetMap and Mapbox products. - NSLocationWhenInUseUsageDescription - The map will display your location. - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/Tests/Integration/CocoaPods/project.yml b/Tests/Integration/CocoaPods/project.yml deleted file mode 100644 index 871598cb..00000000 --- a/Tests/Integration/CocoaPods/project.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: PodInstall -options: - bundleIdPrefix: com.mapbox.common.integration.PodInstall -targets: - PodInstall: - type: application - platform: iOS - deploymentTarget: "13.2" - sources: [Sources] - dependencies: - - sdk: libc++.tbd - settings: - DEVELOPMENT_TEAM: "GJZR2MEM28" - SUPPORTS_MACCATALYST: YES - DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER: YES - OTHER_LDFLAGS: "-lc++" diff --git a/Tests/Integration/test_cocoapods.sh b/Tests/Integration/test_cocoapods.sh deleted file mode 100755 index 972bdf20..00000000 --- a/Tests/Integration/test_cocoapods.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env sh -set -euo pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -ROOT_DIR="${DIR}/../.." -pushd "${ROOT_DIR}/Tests/Integration/CocoaPods" - -xcodegen generate -bundle install -bundle exec pod repo update -bundle exec pod install -xcodebuild -workspace PodInstall.xcworkspace -scheme PodInstall -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' build - -popd diff --git a/scripts/release/Sources/set-marketing-version/main.swift b/scripts/release/Sources/set-marketing-version/main.swift index 62eed199..e3e12b9e 100644 --- a/scripts/release/Sources/set-marketing-version/main.swift +++ b/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() From 226b882c2e7c5b943d8a654d928d53e4efacc422 Mon Sep 17 00:00:00 2001 From: Tatiana Ian Date: Wed, 4 Nov 2026 13:37:33 +0200 Subject: [PATCH 2/2] [ci] Bump xcode version as 14.x not available in circle ci anymore --- .circleci/config.yml | 16 ++-------------- Tests/Integration/test_carthage.sh | 2 +- Tests/Integration/test_spm.sh | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 50b3608d..5d16c87c 100644 --- a/.circleci/config.yml +++ b/.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: diff --git a/Tests/Integration/test_carthage.sh b/Tests/Integration/test_carthage.sh index 6891b329..095c4d65 100755 --- a/Tests/Integration/test_carthage.sh +++ b/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 diff --git a/Tests/Integration/test_spm.sh b/Tests/Integration/test_spm.sh index fbdb1b38..7829eb77 100755 --- a/Tests/Integration/test_spm.sh +++ b/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