From 9a990c00a4997a9452d66a62a13f311e7768e126 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Mon, 17 Aug 2026 03:48:29 +0900 Subject: [PATCH] Release 1.3.1 - Rename ios-geojson-layer to ios-geojson and its SwiftPM package to mapconductor-geojson, matching what consumers already write (import MapConductorGeoJSON, pod MapConductorGeoJSON, com.mapconductor:geojson on Maven Central) - Point every podspec at its repository with :tag instead of a local :path, so the specs can actually be pushed to CocoaPods trunk, and bump them to 1.3.1 - Tag all 16 modules 1.3.1 for SwiftPM - Add a per-PR build check to the modules that need no vendor SDK - Fix scripts/api-surface.sh: under set -u it read the full-width parenthesis after $baseline as part of the variable name CocoaPods now carries ten pods at 1.3.1. ios-for-arcgis, ios-for-here and ios-for-tomtom stay SwiftPM-only: Esri and HERE ship no public pod, and TomTomSDKMapDisplay is not on trunk. --- .gitmodules | 6 +++--- README.es-419.md | 4 ++-- README.ja.md | 4 ++-- README.md | 4 ++-- ios-for-arcgis | 2 +- ios-for-googlemaps | 2 +- ios-for-here | 2 +- ios-for-longdo | 2 +- ios-for-mapbox | 2 +- ios-for-mapkit | 2 +- ios-for-maplibre | 2 +- ios-for-maptiler | 2 +- ios-for-template | 2 +- ios-for-tomtom | 2 +- ios-geojson | 1 + ios-geojson-layer | 1 - ios-heatmap | 2 +- ios-icons | 2 +- ios-kml | 2 +- ios-marker-clustering | 2 +- ios-sdk-core | 2 +- samples/MapConductorSampleApp/project.yml | 6 +++--- scripts/api-surface.sh | 4 ++-- 23 files changed, 30 insertions(+), 30 deletions(-) create mode 160000 ios-geojson delete mode 160000 ios-geojson-layer diff --git a/.gitmodules b/.gitmodules index 7f4da67..1ead7c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,9 +25,9 @@ [submodule "ios-for-here"] path = ios-for-here url = git@github.com:MapConductor/ios-for-here.git -[submodule "ios-geojson-layer"] - path = ios-geojson-layer - url = git@github.com:MapConductor/ios-geojson-layer.git +[submodule "ios-geojson"] + path = ios-geojson + url = git@github.com:MapConductor/ios-geojson.git [submodule "ios-for-maptiler"] path = ios-for-maptiler url = git@github.com:MapConductor/ios-for-maptiler.git diff --git a/README.es-419.md b/README.es-419.md index e7e2ae1..0154aa3 100644 --- a/README.es-419.md +++ b/README.es-419.md @@ -84,7 +84,7 @@ dependencies: [ // Paquetes de funciones opcionales .package(url: "https://github.com/MapConductor/ios-heatmap", from: "1.0.3"), .package(url: "https://github.com/MapConductor/ios-marker-clustering", from: "1.0.2"), - .package(url: "https://github.com/MapConductor/ios-geojson-layer", from: "1.0.0"), + .package(url: "https://github.com/MapConductor/ios-geojson", from: "1.0.0"), ], ``` @@ -331,7 +331,7 @@ Aún se requiere una configuración específica por proveedor, pero la interfaz | `ios-for-maplibre` | `mapconductor-for-maplibre` | `MapConductorForMapLibre` | Implementación del proveedor MapLibre | | `ios-heatmap` | `mapconductor-heatmap` | `MapConductorHeatmap` | Superposición de mapa de calor independiente del proveedor | | `ios-marker-clustering` | `mapconductor-marker-clustering` | `MapConductorMarkerClustering` | Soporte de agrupamiento de marcadores | -| `ios-geojson-layer` | `mapconductor-geojson-layer` | `MapConductorGeoJSONLayer` | Soporte de capas GeoJSON | +| `ios-geojson` | `mapconductor-geojson` | `MapConductorGeoJSON` | Soporte de capas GeoJSON | --- diff --git a/README.ja.md b/README.ja.md index b39875a..0565b4f 100644 --- a/README.ja.md +++ b/README.ja.md @@ -84,7 +84,7 @@ dependencies: [ // オプションの機能パッケージ .package(url: "https://github.com/MapConductor/ios-heatmap", from: "1.0.3"), .package(url: "https://github.com/MapConductor/ios-marker-clustering", from: "1.0.2"), - .package(url: "https://github.com/MapConductor/ios-geojson-layer", from: "1.0.0"), + .package(url: "https://github.com/MapConductor/ios-geojson", from: "1.0.0"), ], ``` @@ -189,7 +189,7 @@ MapLibreMapView(state: maplibreState) { /* overlays */ } | https://github.com/MapConductor/ios-for-maplibre | MapLibreプロバイダー実装 | | https://github.com/MapConductor/ios-heatmap | プロバイダーに依存しないヒートマップオーバーレイ | | https://github.com/MapConductor/ios-marker-clustering | マーカークラスタリングのサポート | -| https://github.com/MapConductor/ios-geojson-layer | GeoJSONレイヤーのサポート | +| https://github.com/MapConductor/ios-geojson | GeoJSONレイヤーのサポート | --- diff --git a/README.md b/README.md index c5c4747..6190221 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ dependencies: [ // Optional feature packages .package(url: "https://github.com/MapConductor/ios-heatmap", from: "1.0.3"), .package(url: "https://github.com/MapConductor/ios-marker-clustering", from: "1.0.2"), - .package(url: "https://github.com/MapConductor/ios-geojson-layer", from: "1.0.0"), + .package(url: "https://github.com/MapConductor/ios-geojson", from: "1.0.0"), ], ``` @@ -210,7 +210,7 @@ Provider-specific setup is still required, but your application-level map UI can | `ios-for-maplibre` | `mapconductor-for-maplibre` | `MapConductorForMapLibre` | MapLibre provider implementation | | `ios-heatmap` | `mapconductor-heatmap` | `MapConductorHeatmap` | Provider-independent heatmap overlay | | `ios-marker-clustering` | `mapconductor-marker-clustering` | `MapConductorMarkerClustering` | Marker clustering support | -| `ios-geojson-layer` | `mapconductor-geojson-layer` | `MapConductorGeoJSONLayer` | GeoJSON layer support | +| `ios-geojson` | `mapconductor-geojson` | `MapConductorGeoJSON` | GeoJSON layer support | --- diff --git a/ios-for-arcgis b/ios-for-arcgis index efa73df..de62bb9 160000 --- a/ios-for-arcgis +++ b/ios-for-arcgis @@ -1 +1 @@ -Subproject commit efa73dfb0639eba14a8f1f9a4658bb52f0336c58 +Subproject commit de62bb9b8ae9165157a3b1bc05e912428e39bd05 diff --git a/ios-for-googlemaps b/ios-for-googlemaps index d5ab528..14e2d5a 160000 --- a/ios-for-googlemaps +++ b/ios-for-googlemaps @@ -1 +1 @@ -Subproject commit d5ab52879db180213726089e70eeebcf227f9d1a +Subproject commit 14e2d5a8fea699fc7caf09586ce446be41131f96 diff --git a/ios-for-here b/ios-for-here index a674aca..05cafa3 160000 --- a/ios-for-here +++ b/ios-for-here @@ -1 +1 @@ -Subproject commit a674aca2404d777a6f3766bb7a494dc96922b75b +Subproject commit 05cafa317a6a165b721290a5c81fdf3a6d37314f diff --git a/ios-for-longdo b/ios-for-longdo index feca680..b9e73f9 160000 --- a/ios-for-longdo +++ b/ios-for-longdo @@ -1 +1 @@ -Subproject commit feca6800dbe28d8fcd1a39ce8c3f6c7480197ac3 +Subproject commit b9e73f9bab16434cb4cbb8c694e92d5722ce352e diff --git a/ios-for-mapbox b/ios-for-mapbox index dfe5703..6ac29ce 160000 --- a/ios-for-mapbox +++ b/ios-for-mapbox @@ -1 +1 @@ -Subproject commit dfe5703e6299567a87753455248ff86c198ef75b +Subproject commit 6ac29ce4ba3aa74cb71e4d65e4cc17ca2f888ca9 diff --git a/ios-for-mapkit b/ios-for-mapkit index e506bc3..8f0e16f 160000 --- a/ios-for-mapkit +++ b/ios-for-mapkit @@ -1 +1 @@ -Subproject commit e506bc3791c79e9d9c800225f7eff6cfea0adf13 +Subproject commit 8f0e16f7ef36d232703ad2b9df9b56ec77c61a71 diff --git a/ios-for-maplibre b/ios-for-maplibre index 7b6fe88..344d35b 160000 --- a/ios-for-maplibre +++ b/ios-for-maplibre @@ -1 +1 @@ -Subproject commit 7b6fe88410491bc0e910f0758681b1fcfff0dffa +Subproject commit 344d35bdbe289fae6127e40c73b9a20e95db88c9 diff --git a/ios-for-maptiler b/ios-for-maptiler index b4687af..12d3fd5 160000 --- a/ios-for-maptiler +++ b/ios-for-maptiler @@ -1 +1 @@ -Subproject commit b4687af182dad9a3100d5d5b542b05ff1870333d +Subproject commit 12d3fd56e9bfef423aa35c8344d1563b2384590b diff --git a/ios-for-template b/ios-for-template index b5c84b4..5df585c 160000 --- a/ios-for-template +++ b/ios-for-template @@ -1 +1 @@ -Subproject commit b5c84b466adeb1e5c51a02c84d2027b51ba9583e +Subproject commit 5df585cac0dadee23393f6256ea714a37ecebec9 diff --git a/ios-for-tomtom b/ios-for-tomtom index cd18f38..949e11c 160000 --- a/ios-for-tomtom +++ b/ios-for-tomtom @@ -1 +1 @@ -Subproject commit cd18f38406f94213ae882ba785258beefc11d701 +Subproject commit 949e11c520d75063fa45c3dd17711fde44d5e964 diff --git a/ios-geojson b/ios-geojson new file mode 160000 index 0000000..716ed47 --- /dev/null +++ b/ios-geojson @@ -0,0 +1 @@ +Subproject commit 716ed478929c9f97fad49df88e412c8889c756cd diff --git a/ios-geojson-layer b/ios-geojson-layer deleted file mode 160000 index 7b14932..0000000 --- a/ios-geojson-layer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7b14932090051fb46f92f50ccc250489ae26c806 diff --git a/ios-heatmap b/ios-heatmap index 2166776..1d2603b 160000 --- a/ios-heatmap +++ b/ios-heatmap @@ -1 +1 @@ -Subproject commit 2166776857f2987f3797d045e7b741b194f505c6 +Subproject commit 1d2603bc4df554d3eed30e3a883fa6099cf7116d diff --git a/ios-icons b/ios-icons index 08c0352..1be49f0 160000 --- a/ios-icons +++ b/ios-icons @@ -1 +1 @@ -Subproject commit 08c0352ad6e4d6823e4bcca1aad8b06e7e549baf +Subproject commit 1be49f0c77a1de39e9ae4709e694b55d14ab2cf1 diff --git a/ios-kml b/ios-kml index 5f15d6d..25f302e 160000 --- a/ios-kml +++ b/ios-kml @@ -1 +1 @@ -Subproject commit 5f15d6df49fd94ad4ce63f96fdaa75c0a34c3d47 +Subproject commit 25f302ed45187de8c990ea273dc7da7cf87906b9 diff --git a/ios-marker-clustering b/ios-marker-clustering index 99fff8d..987be7c 160000 --- a/ios-marker-clustering +++ b/ios-marker-clustering @@ -1 +1 @@ -Subproject commit 99fff8dfa6508481c3e52281133e40f6582642b1 +Subproject commit 987be7c410a477048f649cad1b3ec018918cbc02 diff --git a/ios-sdk-core b/ios-sdk-core index 626600d..c0d3e67 160000 --- a/ios-sdk-core +++ b/ios-sdk-core @@ -1 +1 @@ -Subproject commit 626600de8666463d8b273a8629b5fd4ea9b8fb05 +Subproject commit c0d3e6750ed8be7b6620accba21cb11554e3e489 diff --git a/samples/MapConductorSampleApp/project.yml b/samples/MapConductorSampleApp/project.yml index d67b41e..6c4e210 100644 --- a/samples/MapConductorSampleApp/project.yml +++ b/samples/MapConductorSampleApp/project.yml @@ -19,8 +19,8 @@ packages: path: ../../ios-for-here ios-heatmap: path: ../../ios-heatmap - ios-geojson-layer: - path: ../../ios-geojson-layer + ios-geojson: + path: ../../ios-geojson ios-kml: path: ../../ios-kml ios-marker-clustering: @@ -111,7 +111,7 @@ targets: product: MapConductorForMappls - package: ios-heatmap product: MapConductorHeatmap - - package: ios-geojson-layer + - package: ios-geojson product: MapConductorGeoJSON - package: ios-kml product: MapConductorKML diff --git a/scripts/api-surface.sh b/scripts/api-surface.sh index a6699d6..ed9d247 100755 --- a/scripts/api-surface.sh +++ b/scripts/api-surface.sh @@ -52,7 +52,7 @@ MODULES=( # （android 側は :android-for-template:apiCheck が同じ役目を持つ）。 "ios-for-template:MapConductorForTemplate" "ios-for-tomtom:MapConductorForTomTom" - "ios-geojson-layer:MapConductorGeoJSON" + "ios-geojson:MapConductorGeoJSON" "ios-heatmap:MapConductorHeatmap" "ios-kml:MapConductorKML" "ios-icons:MapConductorIcons" @@ -154,7 +154,7 @@ run() { ;; check) if [ ! -f "$baseline" ]; then - echo " ! ベースラインがありません: $baseline（先に dump が必要）" >&2 + echo " ! ベースラインがありません: ${baseline}（先に dump が必要）" >&2 failed=1 continue fi