chore: merge dev into main

.github/workflows/pull_request.yml

@@ -112,5 +112,10 @@ jobs:
       - name: Create Secrets.xcconfig
         run: echo MAPS_API_KEY="API_KEY" >> example/ios/Secrets.xcconfig
 
+      - name: Install iOS Simulator runtime
+        run: |
+          sudo xcodebuild -runFirstLaunch
+          sudo xcodebuild -downloadPlatform iOS
+
       - name: Build example for iOS
         run: yarn build:ios

README.md

@@ -25,47 +25,14 @@ Add this to your Podfile only for bare React Native apps.
 ```ruby
 post_install do |installer|
   react_native_post_install(
-    installer,
-    config[:reactNativePath],
-    :mac_catalyst_enabled => false,
-  )
-  # Force iOS 16+ to avoid deployment target warnings
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
-    end
-  end
-
-  # --- SVGKit Patch ---
-  require 'fileutils'
-  svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')
-
-  # node fix
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "Node.h"', '#import "SVGKit/Node.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-    # puts "Patched Node import in: #{file}"
-  end
-
-  # import CSSValue.h
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "CSSValue.h"', '#import "SVGKit/CSSValue.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-    # puts "Patched CSSValue import in: #{file}"
-  end
-
-  # import SVGLength.h
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "SVGLength.h"', '#import "SVGKit/SVGLength.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-    # puts "Patched SVGLength import in: #{file}"
-  end
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false,
+      # :ccache_enabled => true
+    )
+
+  require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'
+  apply_svgkit_patch(installer)
 end
 ```
 

android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -345,7 +345,14 @@ class GoogleMapsViewImpl(
   var userInterfaceStyle: Int? = null
     set(value) {
       field = value
-      onUi { googleMap?.mapColorScheme = value ?: MapColorScheme.FOLLOW_SYSTEM }
+      onUi {
+        try {
+          // / not supported when liteMode enabled on latest renderer
+          googleMap?.mapColorScheme = value ?: MapColorScheme.FOLLOW_SYSTEM
+        } catch (_: UnsupportedOperationException) {
+          // / ignore
+        }
+      }
     }
 
   var mapZoomConfig: RNMapZoomConfig? = null

example/ios/GoogleMapsPlusExample.xcodeproj/project.pbxproj

@@ -12,26 +12,26 @@
 		1C2CD62E2E2A54A300F92915 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1C2CD62C2E2A54A300F92915 /* Release.xcconfig */; };
 		1CFDC6AB2E6CA193005652FB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1CFDC6A32E6CA144005652FB /* InfoPlist.strings */; };
 		1CFDC6AC2E6CA193005652FB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1CFDC6A62E6CA144005652FB /* InfoPlist.strings */; };
+		2B37C898F2A1AAA9486D9912 /* Pods_GoogleMapsPlusExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EA1D48E107416ADB6C60F35 /* Pods_GoogleMapsPlusExample.framework */; };
 		50142BCB3C4DD87E00709364 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
 		761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
-		89A7882DE3880107EB2CBBE5 /* Pods_GoogleMapsPlusExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsPlusExample.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsPlusExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMapsPlusExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* GoogleMapsPlusExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsPlusExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = GoogleMapsPlusExample/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = GoogleMapsPlusExample/Info.plist; sourceTree = "<group>"; };
 		13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = GoogleMapsPlusExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		15FC9D1ABAC4D1322D65610A /* Pods-GoogleMapsPlusExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.debug.xcconfig"; sourceTree = "<group>"; };
 		1C2CD62B2E2A54A300F92915 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = GoogleMapsPlusExample/Debug.xcconfig; sourceTree = "<group>"; };
 		1C2CD62C2E2A54A300F92915 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = GoogleMapsPlusExample/Release.xcconfig; sourceTree = "<group>"; };
 		1CFDC6A32E6CA144005652FB /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
 		1CFDC6A62E6CA144005652FB /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
+		5EA1D48E107416ADB6C60F35 /* Pods_GoogleMapsPlusExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMapsPlusExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = GoogleMapsPlusExample/AppDelegate.swift; sourceTree = "<group>"; };
-		784D90989C3F0C69A83034D7 /* Pods-GoogleMapsPlusExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.debug.xcconfig"; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = GoogleMapsPlusExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		CE69916FEF4DE92FC3CC2A4C /* Pods-GoogleMapsPlusExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.release.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.release.xcconfig"; sourceTree = "<group>"; };
+		9B44C46EC9F8E58D8B6DDD10 /* Pods-GoogleMapsPlusExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.release.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -40,7 +40,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				89A7882DE3880107EB2CBBE5 /* Pods_GoogleMapsPlusExample.framework in Frameworks */,
+				2B37C898F2A1AAA9486D9912 /* Pods_GoogleMapsPlusExample.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,7 +85,7 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsPlusExample.framework */,
+				5EA1D48E107416ADB6C60F35 /* Pods_GoogleMapsPlusExample.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -122,8 +122,8 @@
 		BBD78D7AC51CEA395F1C20DB /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				784D90989C3F0C69A83034D7 /* Pods-GoogleMapsPlusExample.debug.xcconfig */,
-				CE69916FEF4DE92FC3CC2A4C /* Pods-GoogleMapsPlusExample.release.xcconfig */,
+				15FC9D1ABAC4D1322D65610A /* Pods-GoogleMapsPlusExample.debug.xcconfig */,
+				9B44C46EC9F8E58D8B6DDD10 /* Pods-GoogleMapsPlusExample.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -135,13 +135,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoogleMapsPlusExample" */;
 			buildPhases = (
-				4E15D3C08A668E0F5197AB1A /* [CP] Check Pods Manifest.lock */,
+				A824DF843ACA8BC144DEDA05 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				A4CAAB1E58D131C3CE20A532 /* [CP] Embed Pods Frameworks */,
-				5AC776E708BE569B105221C3 /* [CP] Copy Pods Resources */,
+				357474998C3CCFA5FBC8D97B /* [CP] Embed Pods Frameworks */,
+				DBF885C9135E7CF4993E741D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -218,7 +218,24 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
-		4E15D3C08A668E0F5197AB1A /* [CP] Check Pods Manifest.lock */ = {
+		357474998C3CCFA5FBC8D97B /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A824DF843ACA8BC144DEDA05 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -240,7 +257,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		5AC776E708BE569B105221C3 /* [CP] Copy Pods Resources */ = {
+		DBF885C9135E7CF4993E741D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -257,23 +274,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A4CAAB1E58D131C3CE20A532 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

example/ios/GoogleMapsPlusExample/Info.plist

@@ -36,7 +36,7 @@
 		<true/>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string>This app needs access to your location to show your current position on the map.</string>
 	<key>RCTNewArchEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

example/ios/Podfile

@@ -28,41 +28,8 @@ target 'GoogleMapsPlusExample' do
       :mac_catalyst_enabled => false,
       # :ccache_enabled => true
     )
-    installer.pods_project.targets.each do |target|
-      target.build_configurations.each do |config|
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
-      end
-    end
 
-    # --- SVGKit Patch ---
-    require 'fileutils'
-    svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')
-
-    # node fix
-    Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-      FileUtils.chmod("u+w", file)
-      text = File.read(file)
-      new_contents = text.gsub('#import "Node.h"', '#import "SVGKit/Node.h"')
-      File.open(file, 'w') { |f| f.write(new_contents) }
-      # puts "Patched Node import in: #{file}"
-    end
-
-    # import CSSValue.h
-    Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-      FileUtils.chmod("u+w", file)
-      text = File.read(file)
-      new_contents = text.gsub('#import "CSSValue.h"', '#import "SVGKit/CSSValue.h"')
-      File.open(file, 'w') { |f| f.write(new_contents) }
-      # puts "Patched CSSValue import in: #{file}"
-    end
-
-    # import SVGLength.h
-    Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-      FileUtils.chmod("u+w", file)
-      text = File.read(file)
-      new_contents = text.gsub('#import "SVGLength.h"', '#import "SVGKit/SVGLength.h"')
-      File.open(file, 'w') { |f| f.write(new_contents) }
-      # puts "Patched SVGLength import in: #{file}"
-    end
+    require_relative '../../scripts/svgkit_patch'
+    apply_svgkit_patch(installer)
   end
 end

example/ios/Podfile.lock

@@ -2504,7 +2504,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - RNGoogleMapsPlus (1.6.2):
+  - RNGoogleMapsPlus (1.8.6):
     - boost
     - DoubleConversion
     - fast_float
@@ -3120,14 +3120,14 @@ SPEC CHECKSUMS:
   ReactCodegen: 0bce2d209e2e802589f4c5ff76d21618200e74cb
   ReactCommon: 801eff8cb9c940c04d3a89ce399c343ee3eff654
   RNGestureHandler: 67501c6d447027581aa1d8e5a7a3ea5a7f0a89ff
-  RNGoogleMapsPlus: 2e51359c4ec90a88a315950cfd8d055c1615d7df
+  RNGoogleMapsPlus: d94844f2d397099f2153d5f9a29e96f70f547bde
   RNReanimated: 8f0185df21f0dea34ee8c9611ba88c17a290ed9a
   RNScreens: 98771ad898d1c0528fc8139606bbacf5a2e9d237
   RNWorklets: ab618bf7d1c7fd2cb793b9f0f39c3e29274b3ebf
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
   Yoga: 526f25666395d30c297d53154398ffd249eaf9e1
 
-PODFILE CHECKSUM: 18d25340bc263a2eab86e2d8e5cfd9ad55ef6458
+PODFILE CHECKSUM: 53fea21acf44c419ecb277b368cb4c1e34124dfb
 
 COCOAPODS: 1.15.2

example/package.json

@@ -8,7 +8,7 @@
     "start": "watchman watch-del-all && react-native start",
     "ios:pods": "rm -f ios/Podfile.lock && rm -rf ios/Pods && cd ios && bundle install && bundle exec pod install --repo-update",
     "build:android": "react-native build-android",
-    "build:ios": "react-native build-ios --mode Debug --extra-params 'CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=\"\" EXPANDED_CODE_SIGN_IDENTITY=\"\" DEVELOPMENT_TEAM=\"\" COCOAPODS_PARALLEL_CODE_SIGN=false'"
+    "build:ios": "react-native build-ios --mode Debug --extra-params 'CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO'"
   },
   "dependencies": {
     "@react-navigation/native": "7.1.19",

expoConfig/src/ios/withIosGoogleMapsPlus.ts

@@ -39,53 +39,21 @@ const withIosGoogleMapsPlus: ConfigPlugin<RNGoogleMapsPlusExpoPluginProps> = (
       }).contents;
     }
 
-    const patchSnippet = `
-  # Force iOS 16+ to avoid deployment target warnings
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
-    end
-  end
-
-  # --- SVGKit Patch ---
-  require 'fileutils'
-  svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')
-
-  # --- Patch Node.h imports ---
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "Node.h"', '#import "SVGKit/Node.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-  end
-
-  # --- Patch CSSValue.h imports ---
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "CSSValue.h"', '#import "SVGKit/CSSValue.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-  end
-
-  # --- Patch SVGLength.h imports ---
-  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
-    FileUtils.chmod("u+w", file)
-    text = File.read(file)
-    new_contents = text.gsub('#import "SVGLength.h"', '#import "SVGKit/SVGLength.h"')
-    File.open(file, 'w') { |f| f.write(new_contents) }
-  end
+    const podFilePatch = `
+  require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'
+  apply_svgkit_patch(installer)
   `;
 
     if (src.includes('post_install do |installer|')) {
       src = src.replace(
         /post_install do \|installer\|([\s\S]*?)end/,
         (match, inner) => {
           if (inner.includes('SVGKit Patch')) return match; // idempotent
-          return `post_install do |installer|${inner}\n${patchSnippet}\nend`;
+          return `post_install do |installer|${inner}\n${podFilePatch}\nend`;
         }
       );
     } else {
-      src += `\npost_install do |installer|\n${patchSnippet}\nend\n`;
+      src += `\npost_install do |installer|\n${podFilePatch}\nend\n`;
     }
 
     conf.modResults.contents = src;