Skip to content
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.

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

feat: upgraded to maven central rallista maplibre compose #199

Merged
merged 2 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/workflows/gradle-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ plugins {

allprojects {
group = "com.stadiamaps.ferrostar"
version = "0.8.0"
version = "0.9.0"
}
2 changes: 1 addition & 1 deletion android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/ferrostar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
50 changes: 0 additions & 50 deletions guide/src/android-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading