diff --git a/Package.swift b/Package.swift index 916891c9..3e41c56b 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ if useLocalFramework { path: "./common/target/ios/libferrostar-rs.xcframework" ) } else { - let releaseTag = "0.7.1" + let releaseTag = "0.7.2" let releaseChecksum = "80a896da507770f5fd8931739e813e1d46ec67cfa46597ea646aa2fb9f6f4a30" binaryTarget = .binaryTarget( name: "FerrostarCoreRS", diff --git a/RELEASE.md b/RELEASE.md index fe86eaaf..385d3ccd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,8 +2,8 @@ When cutting a release, follow this checklist: -1. Ensure that all version strings are up to date. - Currently this means checking `common/ferrostar/Cargo.toml`, `Package.swift`, and `android/build.gradle`. -2. Create a GitHub release and use the new version as the tag name (not that it must be in X.Y.Z format to please SPM). -3. Sit back and watch. GitHub actions take care of the rest. +1. Run `./update-release-version.sh X.Y.Z` with the new version string. Note that this is currently macOS-specific given the vagaries of GNU sed. +2. Commit staged changes and push. +3. Create a GitHub release and use the new version as the tag name (not that it must be in X.Y.Z format to please SPM). +4. Sit back and watch. GitHub actions take care of the rest. Note that iOS CI ends up adding a commit due to the way binary checksumming works. diff --git a/android/build.gradle b/android/build.gradle index e27a3c6d..664cc010 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,5 +25,5 @@ publishing { allprojects { group = "com.stadiamaps.ferrostar" - version = "0.7.1" + version = "0.7.2" } diff --git a/common/Cargo.lock b/common/Cargo.lock index bfdfcf67..79e2b13d 100644 --- a/common/Cargo.lock +++ b/common/Cargo.lock @@ -328,7 +328,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "ferrostar" -version = "0.7.1" +version = "0.7.2" dependencies = [ "assert-json-diff", "geo", diff --git a/common/ferrostar/Cargo.toml b/common/ferrostar/Cargo.toml index 66d663ad..ff60ebf6 100644 --- a/common/ferrostar/Cargo.toml +++ b/common/ferrostar/Cargo.toml @@ -2,7 +2,7 @@ lints.workspace = true [package] name = "ferrostar" -version = "0.7.1" +version = "0.7.2" readme = "README.md" description = "The core of modern turn-by-turn navigation." keywords = ["navigation", "routing", "valhalla", "osrm"] diff --git a/update-release-version.sh b/update-release-version.sh new file mode 100755 index 00000000..e795932b --- /dev/null +++ b/update-release-version.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env zsh + +set -e +set -u + +version=$1 +sed -i "" -E "s/(let releaseTag = \")[^\"]+(\")/\1$version\2/g" Package.swift +sed -i "" -E "s/(version = \")[^\"]+(\")/\1$version\2/g" android/build.gradle +awk '{ if (!done && /version = \"/) { sub(/(version = \")[^\"]+(\")/, "version = \"" newVersion "\""); done=1 } print }' newVersion="$version" common/ferrostar/Cargo.toml > tmpfile && mv tmpfile common/ferrostar/Cargo.toml +cd common && cargo check && cd .. + +git add Package.swift android/build.gradle common/Cargo.lock common/ferrostar/Cargo.toml