Skip to content

Fix turfVersion type and script to set version for SPM test #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aleksproger merged 1 commit into from
Nov 13, 2024
Merged

Fix turfVersion type and script to set version for SPM test #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Foundation
let commonVersion = "24.9.0-daily-2024-11-13-04-26"
let commonChecksum = "16deedc1d8a3bb5b0bebd3e7eb222c87056f04cd9448af21059eed4228c44153"

let turfVersion = "4.0.0-beta.1"
let turfVersion: Version = "4.0.0-beta.1"

let package = Package(
name: "MapboxCommon",
Expand Down
2 changes: 1 addition & 1 deletion Tests/Integration/SPM/project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ options:
packages:
MapboxCommon:
url: [email protected]:mapbox/mapbox-common-ios.git
branch: release-v24.0.0-rc.2
branch: v24.9.0-daily-2024-11-12-04-00
Copy link
Contributor Author

@aleksproger aleksproger Nov 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created a dummy branch with the fix to turfVersion so the test may pass
Otherwise with 24.9.0-daily-2024-11-12-04-26 it will fail
It will be overwritten with proper version with first daily release

targets:
SPMTest:
type: application
Expand Down
12 changes: 10 additions & 2 deletions scripts/release/Sources/set-marketing-version/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ struct MarketingVersion: ParsableCommand {
try content.write(toFile: url.path, atomically: true, encoding: .utf8)
}

func runCarthageVersionUpdate() throws {
let cartfileURL = projectPathURL.appendingPathComponent("Tests/Integration/Carthage/Cartfile")
try replaceLineContaining("binary \"https://api.mapbox.com/downloads/v2/carthage/mapbox-common/",
with: "binary \"https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json\" == \(marketingVersion)",
in: cartfileURL)
}

func runCocoaPodsVersionUpdate() throws {
let podfileURL = projectPathURL.appendingPathComponent("Tests/Integration/CocoaPods/Podfile")
try replaceLineContaining("pod 'MapboxCommon'",
Expand All @@ -54,8 +61,8 @@ struct MarketingVersion: ParsableCommand {

func runSPMVersionUpdate() throws {
let spmManifestURL = projectPathURL.appendingPathComponent("Tests/Integration/SPM/project.yml")
try replaceLineContaining("branch: release/v",
with: " branch: release/v\(marketingVersion)",
try replaceLineContaining("branch: v",
with: " branch: v\(marketingVersion)",
in: spmManifestURL)
let spmPackageURL = projectPathURL.appendingPathComponent("Package.swift")
try replaceLineContaining("let version =",
Expand All @@ -78,6 +85,7 @@ struct MarketingVersion: ParsableCommand {
mutating func run() throws {
try runCocoaPodsVersionUpdate()
try runSPMVersionUpdate()
try runCarthageVersionUpdate()

if isPreRelease {
print("Not updating README.md because this is a proper release.")
Expand Down