From 218f05d3b1eaab179e497c15a7e377459e7d2352 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Mon, 16 Dec 2024 19:16:28 +0100 Subject: [PATCH] feat: upgrade native dependencies --- android/build.gradle | 2 +- docs/guides/setup/iOS.md | 6 +++--- maplibre-react-native.podspec | 2 +- .../project.pbxproj | 16 +++------------- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- scripts/codegen.ts | 8 +++++++- scripts/templates/MapLibreRNStyles.ts.ejs | 3 ++- src/types/MapLibreRNStyles.ts | 2 +- 8 files changed, 20 insertions(+), 23 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 41abb73fe..461039b45 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // MapLibre SDK - implementation "org.maplibre.gl:android-sdk:11.5.0" + implementation "org.maplibre.gl:android-sdk:11.7.0" implementation "org.maplibre.gl:android-sdk-turf:6.0.1" // Dependencies diff --git a/docs/guides/setup/iOS.md b/docs/guides/setup/iOS.md index a08f573c9..b6daee51f 100644 --- a/docs/guides/setup/iOS.md +++ b/docs/guides/setup/iOS.md @@ -12,7 +12,7 @@ Add the following to your `ios/Podfile`: end ``` -Running `pod install` will add version `6.5.4` of the MapLibre SDK. +Running `pod install` will add version `6.8.1` of the MapLibre SDK. ```sh # Go to the ios directory @@ -33,7 +33,7 @@ until this is fixed upstream. iOS devs can open the workspace in Xcode and run f ## Installing a specific version -The current default MapLibre version is `6.5.4`. +The current default MapLibre version is `6.8.1`. If you want to install a different version, you can override as follows in your `Podfile`: @@ -42,7 +42,7 @@ $MLRN_SPM_Spec = { url: "https://github.com/maplibre/maplibre-gl-native-distribution", requirement: { kind: "upToNextMajorVersion", - minimumVersion: "6.5.4" + minimumVersion: "6.8.1" }, product_name: "MapLibre" } diff --git a/maplibre-react-native.podspec b/maplibre-react-native.podspec index f3466147f..bca2335f4 100644 --- a/maplibre-react-native.podspec +++ b/maplibre-react-native.podspec @@ -28,7 +28,7 @@ def $MLRN.post_install(installer) url: "https://github.com/maplibre/maplibre-gl-native-distribution", requirement: { kind: "exactVersion", - version: "6.5.4" + version: "6.8.1" }, product_name: "MapLibre" } diff --git a/packages/react-native-app/ios/MapLibreReactNativeExample.xcodeproj/project.pbxproj b/packages/react-native-app/ios/MapLibreReactNativeExample.xcodeproj/project.pbxproj index 391442e79..c8149a289 100644 --- a/packages/react-native-app/ios/MapLibreReactNativeExample.xcodeproj/project.pbxproj +++ b/packages/react-native-app/ios/MapLibreReactNativeExample.xcodeproj/project.pbxproj @@ -140,10 +140,6 @@ attributes = { LastUpgradeCheck = 1210; TargetAttributes = { - 00E356ED1AD99517003FC87E = { - CreatedOnToolsVersion = 6.2; - TestTargetID = 13B07F861A680F5B00A75B9A; - }; 13B07F861A680F5B00A75B9A = { LastSwiftMigration = 1120; }; @@ -394,10 +390,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -466,10 +459,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; USE_HERMES = true; @@ -506,7 +496,7 @@ repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution"; requirement = { kind = exactVersion; - version = 6.5.4; + version = 6.8.1; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/packages/react-native-app/ios/MapLibreReactNativeExample.xcworkspace/xcshareddata/swiftpm/Package.resolved b/packages/react-native-app/ios/MapLibreReactNativeExample.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6b466cb47..5f4f7d996 100644 --- a/packages/react-native-app/ios/MapLibreReactNativeExample.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/packages/react-native-app/ios/MapLibreReactNativeExample.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/maplibre/maplibre-gl-native-distribution", "state" : { - "revision" : "abe762f1e19e03a4c6943d2aad92c219da384b29", - "version" : "6.5.4" + "revision" : "b84a0decbe9ca1caeff1402efdce71349c09d790", + "version" : "6.8.1" } } ], diff --git a/scripts/codegen.ts b/scripts/codegen.ts index 2c16cf88d..28cb3d23f 100644 --- a/scripts/codegen.ts +++ b/scripts/codegen.ts @@ -118,7 +118,13 @@ async function generate() { }, ); - return layoutProps.concat(paintProps); + const props = [...layoutProps, ...paintProps]; + + return props.filter((prop) => { + // TODO: Codegen adoptions for native style code + // https://github.com/maplibre/maplibre-react-native/issues/562 + return !["textVariableAnchorOffset"].includes(prop.name); + }); } function getSupportedLayers() { diff --git a/scripts/templates/MapLibreRNStyles.ts.ejs b/scripts/templates/MapLibreRNStyles.ts.ejs index c4cabeed8..d7bb7e3f8 100644 --- a/scripts/templates/MapLibreRNStyles.ts.ejs +++ b/scripts/templates/MapLibreRNStyles.ts.ejs @@ -14,7 +14,8 @@ export interface Transition { delay: number; } -export type FormattedString = string; /* TODO */ +<% /* TODO */ %> +export type FormattedString = string; export type ExpressionName = // Types diff --git a/src/types/MapLibreRNStyles.ts b/src/types/MapLibreRNStyles.ts index f088c04d1..81a168f58 100644 --- a/src/types/MapLibreRNStyles.ts +++ b/src/types/MapLibreRNStyles.ts @@ -10,7 +10,7 @@ export interface Transition { delay: number; } -export type FormattedString = string; /* TODO */ +export type FormattedString = string; export type ExpressionName = // Types