Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions RNGoogleMapsPlus.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ Pod::Spec.new do |s|
s.platforms = { :ios => 16.0 }
s.source = { :git => "https://github.com/pinpong/react-native-google-maps-plus.git", :tag => "#{s.version}" }

s.source_files = "ios/**/*.{h,m,mm,swift}"

s.source_files = [
"ios/**/*.{swift}",
"ios/**/*.{m,mm}",
"ios/**/*.{h,m,mm}",
"cpp/**/*.{hpp,cpp}",
]

Expand All @@ -26,9 +24,36 @@ Pod::Spec.new do |s|
s.dependency 'React-jsi'
s.dependency 'React-callinvoker'

s.dependency 'GoogleMaps', '10.4.0'
s.dependency 'Google-Maps-iOS-Utils', '6.1.3'
s.dependency 'SVGKit', '3.0.0'
spm_dependency(s,
url: "https://github.com/googlemaps/ios-maps-sdk",
requirement: { :kind => "exactVersion", :version => "10.4.0" },
products: ["GoogleMaps"]
)

spm_dependency(s,
url: "https://github.com/googlemaps/google-maps-ios-utils",
requirement: { :kind => "exactVersion", :version => "6.1.3" },
products: ["GoogleMapsUtils"]
)

spm_dependency(s,
url: "https://github.com/SVGKit/SVGKit",
requirement: { :kind => "exactVersion", :version => "3.0.0" },
products: ["SVGKit"]
)

Pod::UI.puts "\n"
Pod::UI.puts " ╔═══════════════════════════════════════════════════════════════════════════╗".green
Pod::UI.puts " ║ ║".green
Pod::UI.puts " ║ react-native-google-maps-plus ║".green
Pod::UI.puts " ║ ║".green
Pod::UI.puts " ║ Static framework linking is fully supported! ║".green
Pod::UI.puts " ║ ║".green
Pod::UI.puts " ║ If you see a CocoaPods warning about SPM packages with static ║".green
Pod::UI.puts " ║ linking, you can safely ignore it - it's a generic warning. ║".green
Pod::UI.puts " ║ ║".green
Pod::UI.puts " ╚═══════════════════════════════════════════════════════════════════════════╝".green
Pod::UI.puts "\n"

load 'nitrogen/generated/ios/RNGoogleMapsPlus+autolinking.rb'
add_nitrogen_files(s)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,5 @@ target 'GoogleMapsPlusExample' do
:mac_catalyst_enabled => false,
# :ccache_enabled => true
)

require_relative '../../scripts/svgkit_patch'
apply_svgkit_patch(installer)
end
end
27 changes: 3 additions & 24 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,11 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- CocoaLumberjack (3.9.0):
- CocoaLumberjack/Core (= 3.9.0)
- CocoaLumberjack/Core (3.9.0)
- DoubleConversion (1.1.6)
- fast_float (8.0.0)
- FBLazyVector (0.82.1)
- fmt (11.0.2)
- glog (0.3.5)
- Google-Maps-iOS-Utils (6.1.3):
- GoogleMaps (~> 10.0)
- GoogleMaps (10.4.0):
- GoogleMaps/Maps (= 10.4.0)
- GoogleMaps/Maps (10.4.0)
- hermes-engine (0.82.1):
- hermes-engine/Pre-built (= 0.82.1)
- hermes-engine/Pre-built (0.82.1)
Expand Down Expand Up @@ -2504,14 +2496,12 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNGoogleMapsPlus (1.10.1):
- RNGoogleMapsPlus (1.10.2):
- boost
- DoubleConversion
- fast_float
- fmt
- glog
- Google-Maps-iOS-Utils (= 6.1.3)
- GoogleMaps (= 10.4.0)
- hermes-engine
- NitroModules
- RCT-Folly
Expand All @@ -2535,7 +2525,6 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- SocketRocket
- SVGKit (= 3.0.0)
- Yoga
- RNReanimated (4.1.5):
- boost
Expand Down Expand Up @@ -2778,8 +2767,6 @@ PODS:
- SocketRocket
- Yoga
- SocketRocket (0.7.1)
- SVGKit (3.0.0):
- CocoaLumberjack (~> 3.0)
- Yoga (0.0.0)

DEPENDENCIES:
Expand Down Expand Up @@ -2869,11 +2856,7 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- CocoaLumberjack
- Google-Maps-iOS-Utils
- GoogleMaps
- SocketRocket
- SVGKit

EXTERNAL SOURCES:
boost:
Expand Down Expand Up @@ -3043,14 +3026,11 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
Clusterer: 6b8e946e6d4593644d04acd9c1fca686e8d4f5cb
CocoaLumberjack: 5644158777912b7de7469fa881f8a3f259c2512a
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
FBLazyVector: 0aa6183b9afe3c31fc65b5d1eeef1f3c19b63bfa
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
Google-Maps-iOS-Utils: bed22fa703c919259b3901449434d60d994fae20
GoogleMaps: a40d3b1f511f0fa2036e7b08c920c33279b1d5fd
hermes-engine: 273e30e7fb618279934b0b95ffab60ecedb7acf5
NitroModules: cf8804dafa637b6535c73fd113c3202b11307bfd
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
Expand Down Expand Up @@ -3120,14 +3100,13 @@ SPEC CHECKSUMS:
ReactCodegen: 0bce2d209e2e802589f4c5ff76d21618200e74cb
ReactCommon: 801eff8cb9c940c04d3a89ce399c343ee3eff654
RNGestureHandler: 67501c6d447027581aa1d8e5a7a3ea5a7f0a89ff
RNGoogleMapsPlus: 86ba03df25878d125da670854ba6d4da6a3be09d
RNGoogleMapsPlus: b03dfe02d5c76529862b307ad8ed0af9fa96421e
RNReanimated: 05c5a85c3ee54ac68d60c8a9b42dbc441e3326ca
RNScreens: 98771ad898d1c0528fc8139606bbacf5a2e9d237
RNWorklets: ab618bf7d1c7fd2cb793b9f0f39c3e29274b3ebf
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
Yoga: 526f25666395d30c297d53154398ffd249eaf9e1

PODFILE CHECKSUM: 53fea21acf44c419ecb277b368cb4c1e34124dfb
PODFILE CHECKSUM: c4bfd5273ff3a913a7734e2ea5ae40fdd7a557bb

COCOAPODS: 1.15.2
17 changes: 0 additions & 17 deletions expoConfig/src/ios/withIosGoogleMapsPlus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,6 @@ const withIosGoogleMapsPlus: ConfigPlugin<RNGoogleMapsPlusExpoPluginProps> = (
}).contents;
}

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${podFilePatch}\nend`;
}
);
} else {
src += `\npost_install do |installer|\n${podFilePatch}\nend\n`;
}

conf.modResults.contents = src;
return conf;
});
Expand Down
41 changes: 0 additions & 41 deletions scripts/svgkit_patch.rb

This file was deleted.

17 changes: 0 additions & 17 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,6 @@
* yarn add react-native-google-maps-plus react-native-nitro-modules
* ```
*
* ## iOS Setup (Bare RN only)
*
* Add this to your Podfile:
*
* ```ruby
* post_install do |installer|
* react_native_post_install(
* installer,
* config[:reactNativePath],
* :mac_catalyst_enabled => false,
* )
*
* require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'
* apply_svgkit_patch(installer)
* end
* ```
*
* ## Expo Setup
*
* Add your keys via the config plugin:
Expand Down