diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2455ca0..0def733 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,9 +107,9 @@ jobs: yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" build-ios: - runs-on: macos-latest + runs-on: macos-26 env: - XCODE_VERSION: 16.2 + XCODE_VERSION: 26.x TURBO_CACHE_DIR: .turbo/ios steps: - name: Checkout diff --git a/android/src/main/java/com/yamaplite/Events/CameraPositionChangeEvent.kt b/android/src/main/java/com/yamaplite/Events/CameraPositionChangeEvent.kt index d5e89b0..4be733a 100644 --- a/android/src/main/java/com/yamaplite/Events/CameraPositionChangeEvent.kt +++ b/android/src/main/java/com/yamaplite/Events/CameraPositionChangeEvent.kt @@ -9,13 +9,13 @@ import com.yandex.mapkit.map.CameraUpdateReason class CameraPositionChangeEvent( surfaceId: Int, viewTag: Int, - private val eventName: String, + private val name: String, private val cameraPosition: CameraPosition, private val reason: CameraUpdateReason, private val finished: Boolean, ) : Event(surfaceId, viewTag) { - override fun getEventName(): String = eventName + override fun getEventName(): String = name override fun getEventData(): WritableMap = Arguments.createMap().apply { diff --git a/android/src/main/java/com/yamaplite/Events/PressEvent.kt b/android/src/main/java/com/yamaplite/Events/PressEvent.kt index 8939150..2056769 100644 --- a/android/src/main/java/com/yamaplite/Events/PressEvent.kt +++ b/android/src/main/java/com/yamaplite/Events/PressEvent.kt @@ -8,11 +8,11 @@ import com.yandex.mapkit.geometry.Point class PressEvent( surfaceId: Int, viewTag: Int, - private val eventName: String, + private val name: String, private val point: Point, ) : Event(surfaceId, viewTag) { - override fun getEventName(): String = eventName + override fun getEventName(): String = name override fun getEventData(): WritableMap = Arguments.createMap().apply { diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index ad68255..6f66192 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1679,7 +1679,7 @@ PODS: - React-perflogger (= 0.79.2) - React-utils (= 0.79.2) - SocketRocket (0.7.1) - - YamapLite (1.0.0): + - YamapLite (1.0.2): - DoubleConversion - glog - hermes-engine @@ -2004,10 +2004,10 @@ SPEC CHECKSUMS: React-timing: a90f4654cbda9c628614f9bee68967f1768bd6a5 React-utils: a612d50555b6f0f90c74b7d79954019ad47f5de6 ReactAppDependencyProvider: 04d5eb15eb46be6720e17a4a7fa92940a776e584 - ReactCodegen: a204c3379029e4116b1eda5c1d3a17926db49003 + ReactCodegen: c63eda03ba1d94353fb97b031fc84f75a0d125ba ReactCommon: 76d2dc87136d0a667678668b86f0fca0c16fdeb0 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 - YamapLite: 69b4961e1f7ebf84556009927fb93bad039ce77f + YamapLite: 944f7a153a1f8bb5cecd0492200779dfc2fcd320 YandexMapsMobile: e6443bf72724581ec9f884abdbae254273bc2912 Yoga: c758bfb934100bb4bf9cbaccb52557cee35e8bdf diff --git a/ios/ClusteredYamapLiteView.mm b/ios/ClusteredYamapLiteView.mm index 5947142..328a725 100644 --- a/ios/ClusteredYamapLiteView.mm +++ b/ios/ClusteredYamapLiteView.mm @@ -17,7 +17,11 @@ #import #import "RCTFabricComponentsPlugins.h" +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif #import using namespace facebook::react; diff --git a/ios/YamapLiteCircleView.mm b/ios/YamapLiteCircleView.mm index eebe3d0..68990c8 100644 --- a/ios/YamapLiteCircleView.mm +++ b/ios/YamapLiteCircleView.mm @@ -13,7 +13,11 @@ #import #import "RCTFabricComponentsPlugins.h" +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif using namespace facebook::react; diff --git a/ios/YamapLiteMarkerView.mm b/ios/YamapLiteMarkerView.mm index 782f7f4..dd8275f 100644 --- a/ios/YamapLiteMarkerView.mm +++ b/ios/YamapLiteMarkerView.mm @@ -8,7 +8,11 @@ #import #import "RCTFabricComponentsPlugins.h" +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif #import #import #import diff --git a/ios/YamapLitePolygonView.mm b/ios/YamapLitePolygonView.mm index 41a970b..528c1bd 100644 --- a/ios/YamapLitePolygonView.mm +++ b/ios/YamapLitePolygonView.mm @@ -14,7 +14,11 @@ #import "RCTFabricComponentsPlugins.h" #import "Utils/PointsEqual.h" +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif #import using namespace facebook::react; diff --git a/ios/YamapLitePolylineView.mm b/ios/YamapLitePolylineView.mm index 581e966..54faf7b 100644 --- a/ios/YamapLitePolylineView.mm +++ b/ios/YamapLitePolylineView.mm @@ -14,7 +14,11 @@ #import "RCTFabricComponentsPlugins.h" #import "Utils/PointsEqual.h" +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif #import using namespace facebook::react; diff --git a/ios/YamapLiteView.mm b/ios/YamapLiteView.mm index 8e78679..eaa60cf 100644 --- a/ios/YamapLiteView.mm +++ b/ios/YamapLiteView.mm @@ -17,7 +17,11 @@ #import #import "RCTFabricComponentsPlugins.h" +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif using namespace facebook::react; diff --git a/ios/YamapUtils.mm b/ios/YamapUtils.mm index d3f3145..18dab53 100644 --- a/ios/YamapUtils.mm +++ b/ios/YamapUtils.mm @@ -8,7 +8,11 @@ #import #import +#if __has_include("YamapLite/YamapLite-Swift.h") +#import "YamapLite/YamapLite-Swift.h" +#else #import "YamapLite-Swift.h" +#endif #import #import diff --git a/package.json b/package.json index b33cc36..c9c766e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@exterio/react-native-yamap-lite", - "version": "1.0.1", + "version": "1.0.3", "description": "A lightweight wrapper for the Yandex MapKit SDK", "main": "./lib/module/index.js", "module": "./lib/module/index.js",