From ea5bd393c664a54513531998bf8609a0535639f7 Mon Sep 17 00:00:00 2001 From: tei Date: Fri, 9 Oct 2026 14:08:10 +0900 Subject: [PATCH] release: prepare unified particle.22 --- .../MapLibreParticleRNTestHost/package.json | 2 +- .../plugins/withParticleNativeAndroid.js | 2 +- packages/maplibre-particle-rn/CHANGELOG.md | 3 +++ .../maplibre-particle-rn/MapLibreParticleRN.podspec | 4 ++-- packages/maplibre-particle-rn/README.md | 12 ++++++------ packages/maplibre-particle-rn/android/build.gradle | 2 +- packages/maplibre-particle-rn/app.plugin.js | 2 +- packages/maplibre-particle-rn/package.json | 6 +++--- platform/android/VERSION | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/integration/react-native/MapLibreParticleRNTestHost/package.json b/integration/react-native/MapLibreParticleRNTestHost/package.json index 3a895e98b..1289765c1 100644 --- a/integration/react-native/MapLibreParticleRNTestHost/package.json +++ b/integration/react-native/MapLibreParticleRNTestHost/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@navsea/maplibre-particle-rn": "https://pbf.jpcn.ccwu.cc/npm/navsea-maplibre-particle-rn-13.4.1-particle.13.tgz", - "@maplibre/maplibre-react-native": "11.3.6", + "@maplibre/maplibre-react-native": "11.5.0", "expo": "56.0.4", "expo-asset": "~56.0.14", "expo-file-system": "56.0.11", diff --git a/integration/react-native/MapLibreParticleRNTestHost/plugins/withParticleNativeAndroid.js b/integration/react-native/MapLibreParticleRNTestHost/plugins/withParticleNativeAndroid.js index fc27be454..a99528d97 100644 --- a/integration/react-native/MapLibreParticleRNTestHost/plugins/withParticleNativeAndroid.js +++ b/integration/react-native/MapLibreParticleRNTestHost/plugins/withParticleNativeAndroid.js @@ -6,7 +6,7 @@ const marker = "// MapLibreParticleRNTestHost NavSea Particle release SDK"; module.exports = function withParticleNativeAndroid(config) { return withProjectBuildGradle(config, (project) => { if (project.modResults.contents.includes(marker)) return project; - project.modResults.contents += `\n${marker}\ngradle.projectsEvaluated {\n allprojects { p ->\n p.repositories.maven { repository -> repository.url = p.uri("https://pbf.jpcn.ccwu.cc/maven") }\n p.configurations.configureEach { configuration ->\n configuration.resolutionStrategy.dependencySubstitution {\n substitute module("org.maplibre.gl:android-sdk-opengl") using module("cc.navsea.maplibre:android-sdk-particle-opengl:13.4.1-particle.21")\n }\n }\n }\n}\nrootProject.ext.set("org.maplibre.reactnative.nativeVersion", "13.4.1")\nrootProject.ext.set("org.maplibre.reactnative.nativeVariant", "opengl")\n`; + project.modResults.contents += `\n${marker}\ngradle.projectsEvaluated {\n allprojects { p ->\n p.repositories.maven { repository -> repository.url = p.uri("https://pbf.jpcn.ccwu.cc/maven") }\n p.configurations.configureEach { configuration ->\n configuration.resolutionStrategy.dependencySubstitution {\n substitute module("org.maplibre.gl:android-sdk-opengl") using module("cc.navsea.maplibre:android-sdk-particle-opengl:13.6.1-particle.22")\n }\n }\n }\n}\nrootProject.ext.set("org.maplibre.reactnative.nativeVersion", "13.6.1")\nrootProject.ext.set("org.maplibre.reactnative.nativeVariant", "opengl")\n`; return project; }); }; diff --git a/packages/maplibre-particle-rn/CHANGELOG.md b/packages/maplibre-particle-rn/CHANGELOG.md index d306a28c7..22eac2c92 100644 --- a/packages/maplibre-particle-rn/CHANGELOG.md +++ b/packages/maplibre-particle-rn/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +## 13.6.1-particle.22（Android / iOS 统一发行） + +- Mac unified release pipeline 统一生成 Android Native、RN package 与 iOS SwiftPM/XCFramework；共享 Particle revision 22。 ## 13.4.1-particle.21（Android / iOS 统一发行） - Mac unified release pipeline 统一生成 Android Native、RN package 与 iOS SwiftPM/XCFramework；共享 Particle revision 21。 diff --git a/packages/maplibre-particle-rn/MapLibreParticleRN.podspec b/packages/maplibre-particle-rn/MapLibreParticleRN.podspec index 621651d51..7e19264e0 100644 --- a/packages/maplibre-particle-rn/MapLibreParticleRN.podspec +++ b/packages/maplibre-particle-rn/MapLibreParticleRN.podspec @@ -9,7 +9,7 @@ $MLRN_PARTICLE = Object.new def $MLRN_PARTICLE.post_install(installer) unless defined?($MLRN) && $MLRN.respond_to?(:_add_spm_to_target) - raise "MapLibreParticleRN requires MapLibreReactNative's $MLRN._add_spm_to_target helper. Ensure MapLibreReactNative 11.3.6 is installed before calling $MLRN_PARTICLE.post_install." + raise "MapLibreParticleRN requires MapLibreReactNative's $MLRN._add_spm_to_target helper. Ensure MapLibreReactNative 11.5.0 is installed before calling $MLRN_PARTICLE.post_install." end unless defined?($MLRN_SPM_SPEC) && $MLRN_SPM_SPEC.is_a?(Hash) @@ -44,7 +44,7 @@ Pod::Spec.new do |s| s.platforms = { :ios => "15.1" } s.source = { :git => package.dig("repository", "url"), :tag => s.version.to_s } s.source_files = "ios/**/*.{h,m,mm,cpp}" - s.dependency "MapLibreReactNative", "11.3.6" + s.dependency "MapLibreReactNative", "11.5.0" # $MLRN_PARTICLE.post_install reuses MapLibreReactNative's one MapLibre SPM # product. Do not declare a MapLibre pod, vendored framework, or SPM product here. install_modules_dependencies(s) diff --git a/packages/maplibre-particle-rn/README.md b/packages/maplibre-particle-rn/README.md index a0cbafd57..5f117eb65 100644 --- a/packages/maplibre-particle-rn/README.md +++ b/packages/maplibre-particle-rn/README.md @@ -1,6 +1,6 @@ # @navsea/maplibre-particle-rn -当前版本：`13.4.1-particle.21`。Android Native 必须配套 `cc.navsea.maplibre:android-sdk-particle-opengl:13.4.1-particle.21`。本包是 React Native 的薄控制面，不负责 Map 组件、provider、HTTP、manifest、下载、缓存或 NavSea 业务策略。 +当前版本：`13.6.1-particle.22`。Android Native 必须配套 `cc.navsea.maplibre:android-sdk-particle-opengl:13.6.1-particle.22`。本包是 React Native 的薄控制面，不负责 Map 组件、provider、HTTP、manifest、下载、缓存或 NavSea 业务策略。 ## 当前推荐主链：QBIN V4 @@ -24,11 +24,11 @@ V4 主要公共方法：`submitEncodedField`、`setEncodedColorBinding`、`setEn ## Map / Camera -Map 与 Camera 直接从 `@maplibre/maplibre-react-native@11.3.6` 使用。本包把 MLRN 作为 peer dependency，不转导出 MapLibre React Native。 +Map 与 Camera 直接从 `@maplibre/maplibre-react-native@11.5.0` 使用。本包把 MLRN 作为 peer dependency，不转导出 MapLibre React Native。 ## iOS 集成 -autolinking 使用 `MapLibreParticleRN.podspec` 和 RN codegen 的 `WeatherRuntimeBridge` provider。pod 只依赖 `MapLibreReactNative`，不声明、链接或嵌入第二份 `MapLibre.framework`。Consumer 必须以 MLRN 11.3.6 的 `$MLRN_SPM_SPEC` 配置同一个 custom `MapLibre` product；Particle pod 不接受独立 MapLibre binary。 +autolinking 使用 `MapLibreParticleRN.podspec` 和 RN codegen 的 `WeatherRuntimeBridge` provider。pod 只依赖 `MapLibreReactNative`，不声明、链接或嵌入第二份 `MapLibre.framework`。Consumer 必须以 MLRN 11.5.0 的 `$MLRN_SPM_SPEC` 配置同一个 custom `MapLibre` product；Particle pod 不接受独立 MapLibre binary。 Podfile 的 `post_install do |installer|` 必须同时调用 `$MLRN.post_install(installer)` 与 `$MLRN_PARTICLE.post_install(installer)`。两者复用同一个 `$MLRN_SPM_SPEC`：前者接入 MLRN/App，后者将同一 package reference/product 加到 `MapLibreParticleRN` pod target。Expo plugin 会幂等注入后一个调用；它不设置 `$MLRN_SPM_SPEC`，该值仍由 MLRN 官方 plugin 或宿主 Podfile 提供。 @@ -37,7 +37,7 @@ Podfile 的 `post_install do |installer|` 必须同时调用 `$MLRN.post_install RN tgz： ```text -https://pbf.jpcn.ccwu.cc/npm/navsea-maplibre-particle-rn-13.4.1-particle.21.tgz +https://pbf.jpcn.ccwu.cc/npm/navsea-maplibre-particle-rn-13.6.1-particle.22.tgz ``` Native Maven repository： @@ -49,7 +49,7 @@ https://pbf.jpcn.ccwu.cc/maven Native coordinate： ```text -cc.navsea.maplibre:android-sdk-particle-opengl:13.4.1-particle.21 +cc.navsea.maplibre:android-sdk-particle-opengl:13.6.1-particle.22 ``` -Expo plugin 与 `android/build.gradle` 必须指向同一 `.21`。正常 Consumer 不复制 AAR、不依赖 MapLibreParticleLab 源码路径，也不以 Maven Local 作为公网验证主路径。完整 Linux 发布与 Win11 验证流程见 `docs/50_Step记录/STEP-080_Android_AAR与RNTestHost标准构建流水线_v2.md`。 +Expo plugin 与 `android/build.gradle` 必须指向同一 `.22`。正常 Consumer 不复制 AAR、不依赖 MapLibreParticleLab 源码路径，也不以 Maven Local 作为公网验证主路径。完整 Linux 发布与 Win11 验证流程见 `docs/50_Step记录/STEP-080_Android_AAR与RNTestHost标准构建流水线_v2.md`。 diff --git a/packages/maplibre-particle-rn/android/build.gradle b/packages/maplibre-particle-rn/android/build.gradle index 277462a29..cbf54c57e 100644 --- a/packages/maplibre-particle-rn/android/build.gradle +++ b/packages/maplibre-particle-rn/android/build.gradle @@ -14,7 +14,7 @@ android { dependencies { implementation "com.facebook.react:react-android" implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.20" - implementation "cc.navsea.maplibre:android-sdk-particle-opengl:13.4.1-particle.21" + implementation "cc.navsea.maplibre:android-sdk-particle-opengl:13.6.1-particle.22" compileOnly project(":maplibre_maplibre-react-native") testImplementation "junit:junit:4.13.2" } diff --git a/packages/maplibre-particle-rn/app.plugin.js b/packages/maplibre-particle-rn/app.plugin.js index 6362c40a1..b1a8d6135 100644 --- a/packages/maplibre-particle-rn/app.plugin.js +++ b/packages/maplibre-particle-rn/app.plugin.js @@ -20,7 +20,7 @@ const iosTag = "navsea-maplibre-particle-rn-maplibre-spm"; module.exports = function withNavSeaMapLibreParticle(config) { config = withProjectBuildGradle(config, (project) => { if (project.modResults.contents.includes(androidMarker)) return project; - project.modResults.contents += `\n${androidMarker}\ngradle.projectsEvaluated {\n allprojects { p ->\n p.repositories.maven { repository -> repository.url = p.uri("https://pbf.jpcn.ccwu.cc/maven") }\n p.configurations.configureEach { configuration ->\n configuration.resolutionStrategy.dependencySubstitution {\n substitute module("org.maplibre.gl:android-sdk-opengl") using module("cc.navsea.maplibre:android-sdk-particle-opengl:13.4.1-particle.21")\n }\n }\n }\n}\nrootProject.ext.set("org.maplibre.reactnative.nativeVersion", "13.4.1")\nrootProject.ext.set("org.maplibre.reactnative.nativeVariant", "opengl")\n`; + project.modResults.contents += `\n${androidMarker}\ngradle.projectsEvaluated {\n allprojects { p ->\n p.repositories.maven { repository -> repository.url = p.uri("https://pbf.jpcn.ccwu.cc/maven") }\n p.configurations.configureEach { configuration ->\n configuration.resolutionStrategy.dependencySubstitution {\n substitute module("org.maplibre.gl:android-sdk-opengl") using module("cc.navsea.maplibre:android-sdk-particle-opengl:13.6.1-particle.22")\n }\n }\n }\n}\nrootProject.ext.set("org.maplibre.reactnative.nativeVersion", "13.6.1")\nrootProject.ext.set("org.maplibre.reactnative.nativeVariant", "opengl")\n`; return project; }); diff --git a/packages/maplibre-particle-rn/package.json b/packages/maplibre-particle-rn/package.json index 53d7b5beb..ef31fd745 100644 --- a/packages/maplibre-particle-rn/package.json +++ b/packages/maplibre-particle-rn/package.json @@ -1,6 +1,6 @@ { "name": "@navsea/maplibre-particle-rn", - "version": "13.4.1-particle.21", + "version": "13.6.1-particle.22", "description": "NavSea MapLibre Particle React Native pure Field Renderer API.", "license": "BSD-2-Clause", "main": "src/index.ts", @@ -29,7 +29,7 @@ "url": "https://git.eyaku.jp/tei/MapLibreParticleLab" }, "peerDependencies": { - "@maplibre/maplibre-react-native": "11.3.6", + "@maplibre/maplibre-react-native": "11.5.0", "expo": ">=54.0.0", "react": ">=19.1.0", "react-native": ">=0.80.0" @@ -53,6 +53,6 @@ } }, "devDependencies": { - "@maplibre/maplibre-react-native": "11.3.6" + "@maplibre/maplibre-react-native": "11.5.0" } } diff --git a/platform/android/VERSION b/platform/android/VERSION index 4daad9a5c..07d8f5c6a 100644 --- a/platform/android/VERSION +++ b/platform/android/VERSION @@ -1 +1 @@ -13.6.1 +13.6.1-particle.22