From 8ec02c895ab50d39fbae49d2189bc2d9c854e922 Mon Sep 17 00:00:00 2001 From: Jacob Fielding Date: Tue, 27 Aug 2024 18:37:02 -0700 Subject: [PATCH 1/2] feat: upgraded to maven central rallista maplibre compose --- .github/workflows/gradle-publish.yml | 3 -- android/build.gradle | 2 +- android/gradle/libs.versions.toml | 2 +- android/settings.gradle | 8 ----- guide/src/android-getting-started.md | 50 ---------------------------- 5 files changed, 2 insertions(+), 63 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 5c77c30a..28f963f6 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -44,6 +44,3 @@ jobs: ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_TOKEN }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_GPG_SECRET_KEY }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - # TODO: Remove these once Rallista's compose wrapper moves to Maven Central - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/android/build.gradle b/android/build.gradle index afca0ee3..071768d9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,5 +12,5 @@ plugins { allprojects { group = "com.stadiamaps.ferrostar" - version = "0.8.0" + version = "0.9.0" } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 0acd1416..cecda376 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -14,7 +14,7 @@ androidx-activity-compose = "1.9.1" compose = "2024.06.00" okhttp = "4.12.0" moshi = "1.15.1" -maplibre-compose = "0.0.15" +maplibre-compose = "0.0.16" junit = "4.13.2" junitVersion = "1.2.1" junitCompose = "1.6.8" diff --git a/android/settings.gradle b/android/settings.gradle index c22b589d..64905c23 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -8,14 +8,6 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - maven { - url = 'https://maven.pkg.github.com/Rallista/maplibre-compose-playground' - credentials { - username = settings.ext.find('gpr.user') ?: System.getenv('GITHUB_ACTOR') - password = settings.ext.find('gpr.token') ?: System.getenv('GITHUB_TOKEN') - } - } - google() mavenCentral() } diff --git a/guide/src/android-getting-started.md b/guide/src/android-getting-started.md index a46e5b3d..2b8e733e 100644 --- a/guide/src/android-getting-started.md +++ b/guide/src/android-getting-started.md @@ -5,56 +5,6 @@ We'll cover the "batteries included" approach, but flag areas for customization ## Gradle setup -### GitHub Packages - -Ferrostar releases (since 0.8.0) are hosted on Maven Central. -However, we are still in the process of transitioning the MapLibre composable UI wrapper. -In the meantime, you will still need to set up GitHub Packages, which requires authentication. - -GitHub has a [guide on setting this up](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#authenticating-to-github-packages). -Once you’ve configured GitHub credentials as project properties or environment variables, -add the repository to your build script. - -If you are using `settings.gradle` for your dependency resolution management, -you’ll end up with something like along these lines: - -```groovy -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - // For the MapLibre compose integration - maven { - url = 'https://maven.pkg.github.com/Rallista/maplibre-compose-playground' - credentials { - username = settings.ext.find('gpr.user') ?: System.getenv('GITHUB_ACTOR') - password = settings.ext.find('gpr.token') ?: System.getenv('GITHUB_TOKEN') - } - } - - google() - mavenCentral() - } -} -``` - -And if you’re doing this directly in `build.gradle`, things look slightly different: - -```groovy -repositories { - google() - mavenCentral() - - // For the MapLibre compose integration - maven { - url = uri("https://maven.pkg.github.com/Rallista/maplibre-compose-playground") - credentials { - username = settings.ext.find("gpr.user") ?: System.getenv("GITHUB_ACTOR") - password = settings.ext.find("gpr.token") ?: System.getenv("GITHUB_TOKEN") - } - } -} -``` - ### Add dependencies #### `build.gradle` with explicit version strings From abbf02e5b5adaf2b914fcc8c4155c23bd34e2c80 Mon Sep 17 00:00:00 2001 From: Jacob Fielding Date: Tue, 27 Aug 2024 18:46:13 -0700 Subject: [PATCH 2/2] feat: upgraded to maven central rallista maplibre compose --- Package.swift | 2 +- common/Cargo.lock | 2 +- common/ferrostar/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index b7c466f4..09677426 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ if useLocalFramework { path: "./common/target/ios/libferrostar-rs.xcframework" ) } else { - let releaseTag = "0.8.0" + let releaseTag = "0.9.0" let releaseChecksum = "0007409e20c8b7dce47e3b6bc6597bff5484089451af9cb2e35777fa9fed5fc1" binaryTarget = .binaryTarget( name: "FerrostarCoreRS", diff --git a/common/Cargo.lock b/common/Cargo.lock index abd31ae5..9ec69ff3 100644 --- a/common/Cargo.lock +++ b/common/Cargo.lock @@ -328,7 +328,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "ferrostar" -version = "0.8.0" +version = "0.9.0" dependencies = [ "assert-json-diff", "geo", diff --git a/common/ferrostar/Cargo.toml b/common/ferrostar/Cargo.toml index 64e0c290..462c66a9 100644 --- a/common/ferrostar/Cargo.toml +++ b/common/ferrostar/Cargo.toml @@ -2,7 +2,7 @@ lints.workspace = true [package] name = "ferrostar" -version = "0.8.0" +version = "0.9.0" readme = "README.md" description = "The core of modern turn-by-turn navigation." keywords = ["navigation", "routing", "valhalla", "osrm"]