diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 13bdc5db..a0b718bb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,7 +40,10 @@ jobs: fi - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 + with: + submodules: recursive + token: ${{ secrets.GITHUB_TOKEN }} - name: Write gradle.properties run: | @@ -54,15 +57,15 @@ jobs: echo "NDK_VERSION=${NDK_VERSION}" >> $GITHUB_ENV - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: 17 - - name: Install Android NDK $NDK_VERSION - uses: android-actions/setup-android@v3 - with: - packages: "build-tools;36.0.0 ndk;${{ env.NDK_VERSION }} platform-tools platforms;android-35" +# - name: Install Android NDK $NDK_VERSION +# uses: android-actions/setup-android@v3 +# with: +# packages: "build-tools;36.0.0 ndk;${{ env.NDK_VERSION }} platform-tools platforms;android-35" - name: Read module list from projects.properties id: define @@ -73,7 +76,7 @@ jobs: # echo "here_sdk_artifact=$here_sdk_name" >> $GITHUB_OUTPUT - name: Restore hash cache - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 with: key: lint-hash-cache-${{ github.base_ref || 'main' }} path: .lint-hash-cache/ @@ -168,7 +171,7 @@ jobs: - name: Save hash cache if: success() - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 with: key: lint-hash-cache-${{ github.base_ref || 'main' }}-${{ github.run_id }} path: .lint-hash-cache/ diff --git a/.github/workflows/publish-maven-central-only-bom.yml b/.github/workflows/publish-maven-central-only-bom.yml index c7108584..e299fdb2 100644 --- a/.github/workflows/publish-maven-central-only-bom.yml +++ b/.github/workflows/publish-maven-central-only-bom.yml @@ -18,13 +18,13 @@ jobs: ANDROID_HOME: /usr/local/lib/android/sdk steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: recursive token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: '17' diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml.disabled similarity index 99% rename from .github/workflows/publish-maven-central.yml rename to .github/workflows/publish-maven-central.yml.disabled index 4cb608b2..5b089410 100644 --- a/.github/workflows/publish-maven-central.yml +++ b/.github/workflows/publish-maven-central.yml.disabled @@ -19,7 +19,7 @@ jobs: ANDROID_HOME: /usr/local/lib/android/sdk steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: submodules: recursive token: ${{ secrets.GITHUB_TOKEN }} diff --git a/android-for-arcgis b/android-for-arcgis index f54bfdb5..12121789 160000 --- a/android-for-arcgis +++ b/android-for-arcgis @@ -1 +1 @@ -Subproject commit f54bfdb55c61022843afeaa682eeaa0fcd8279c1 +Subproject commit 12121789bd4e22f0b75c1d44443c57c2131c8bf0 diff --git a/android-for-googlemaps b/android-for-googlemaps index bb70695f..ed1d504c 160000 --- a/android-for-googlemaps +++ b/android-for-googlemaps @@ -1 +1 @@ -Subproject commit bb70695f98f500512fc5bdc0fd0abdcf1857bd8c +Subproject commit ed1d504ce86b1457af8411d33bfc898b42039879 diff --git a/android-for-here b/android-for-here index c3915085..044b4f4b 160000 --- a/android-for-here +++ b/android-for-here @@ -1 +1 @@ -Subproject commit c3915085f057320a90428f83d6e0d1c25c4cc58d +Subproject commit 044b4f4b4d807418c32e76442e34c72dd42052a2 diff --git a/android-for-mapbox b/android-for-mapbox index bc4f6899..9f2fe611 160000 --- a/android-for-mapbox +++ b/android-for-mapbox @@ -1 +1 @@ -Subproject commit bc4f6899661896a81dbe4222eed8abb764c02c46 +Subproject commit 9f2fe611d37a239a31f56d9c770ee0ae8fa07903 diff --git a/android-for-maplibre b/android-for-maplibre index fbe67094..9399e756 160000 --- a/android-for-maplibre +++ b/android-for-maplibre @@ -1 +1 @@ -Subproject commit fbe67094d70cb7160bcce2ab307da9fe762096df +Subproject commit 9399e756365194abbddde78411ba0bb8fe5fe615 diff --git a/android-sdk-core b/android-sdk-core index 221a9496..6f9e34a7 160000 --- a/android-sdk-core +++ b/android-sdk-core @@ -1 +1 @@ -Subproject commit 221a9496744775f3564b49d9dc2919cf3cc2dea5 +Subproject commit 6f9e34a7e225d0320cb70621525b5fa739e0c80b diff --git a/docs/astro.config.ts b/docs/astro.config.ts index 7e8259fc..bd8aba83 100644 --- a/docs/astro.config.ts +++ b/docs/astro.config.ts @@ -13,8 +13,14 @@ export default defineConfig({ integrations: [ postBuildIntegration(), starlight({ - title: 'MapConductor', - description: 'A unified map SDK for mobile developers', + title: { + en: "MapConductor — a unified Android maps SDK that lets you work with multiple map providers through a single API", + ja: "MapConductor(マップコンダクター) ♪ 複数の地図プロバイダを単一のAPIで扱えるAndroid向け統一地図SDK", + "es-419": "MapConductor — Un SDK de mapas unificado para Android que ofrece una API común para múltiples proveedores de mapas", + }, + markdown: { + headingLinks: false, + }, defaultLocale: 'root', locales: { root: { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bbcf2b10..1a2f7479 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ uiToolingPreview = "1.9.1" uiTooling = "1.9.1" geographiclib = "2.1" material = "1.10.0" -mapLibreSdk = "13.0.2" +mapLibreSdk = "13.1.0" mapLibreAnnotation = "3.0.2" runtime = "1.10.6" runtimeVersion = "1.10.6"