Merge pull request #199 from stadiamaps/feat/android/maven-central-ma…

…plibre feat: upgraded to maven central rallista maplibre compose
stadiamaps · Aug 28, 2024 · e1859bd · e1859bd
2 parents 1633e69 + abbf02e
commit e1859bd
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 66 deletions.
diff --git 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/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/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
@@ -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
@@ -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/common/Cargo.lock b/common/Cargo.lock
diff --git 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"]

diff --git 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