react-native-maps 1.21.0-alpha.89 → 1.21.0-alpha.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm +1 -6
  2. package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm +2 -4
  3. package/ios/AirMaps/RNMapsAirModule.h +1 -1
  4. package/ios/AirMaps/RNMapsMapView.mm +1 -4
  5. package/ios/AirMaps/RNMapsMarkerView.mm +1 -4
  6. package/ios/generated/module.modulemap +4 -0
  7. package/ios/generated/react-native-maps-generated-umbrella.h +14 -0
  8. package/package.json +1 -1
  9. package/react-native-maps.podspec +61 -17
package/ios/AirGoogleMaps/RNMapsGoogleMapView.mm CHANGED
@@ -12,12 +12,7 @@
12
12
  #import "AIRGoogleMap.h"
13
13
  #import "AIRMapMarker.h"
14
14
  #import "AIRGoogleMapManager.h"
15
-
16
- #import <react-native-maps-generated/ComponentDescriptors.h>
17
- #import <react-native-maps-generated/EventEmitters.h>
18
- #import <react-native-maps-generated/Props.h>
19
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
20
-
15
+ #import "react-native-maps-generated-umbrella.h"
21
16
  #import "RCTFabricComponentsPlugins.h"
22
17
  #import <React/RCTConversions.h>
23
18
  #import "RCTConvert+GMSMapViewType.h"
package/ios/AirGoogleMaps/RNMapsGooglePolygonView.mm CHANGED
@@ -11,10 +11,8 @@
11
11
  #import "AIRGMSPolygon.h"
12
12
  #import "AIRGoogleMap.h"
13
13
 
14
- #import <react-native-maps-generated/ComponentDescriptors.h>
15
- #import <react-native-maps-generated/EventEmitters.h>
16
- #import <react-native-maps-generated/Props.h>
17
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
14
+ #import "react-native-maps-generated-umbrella.h"
15
+
18
16
 
19
17
  #import "RCTFabricComponentsPlugins.h"
20
18
  #import <React/RCTConversions.h>
package/ios/AirMaps/RNMapsAirModule.h CHANGED
@@ -3,7 +3,7 @@
3
3
  #ifdef RCT_NEW_ARCH_ENABLED
4
4
 
5
5
  #import <Foundation/Foundation.h>
6
- #import <react-native-maps-generated/RNMapsSpecs.h>
6
+ #import "react-native-maps-generated-umbrella.h"
7
7
 
8
8
  NS_ASSUME_NONNULL_BEGIN
9
9
 
package/ios/AirMaps/RNMapsMapView.mm CHANGED
@@ -11,10 +11,7 @@
11
11
  #import "AIRMapMarker.h"
12
12
  #import "AIRMapManager.h"
13
13
  #import "RNMapsMarkerView.h"
14
- #import <react-native-maps-generated/ComponentDescriptors.h>
15
- #import <react-native-maps-generated/EventEmitters.h>
16
- #import <react-native-maps-generated/Props.h>
17
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
14
+ #import "react-native-maps-generated-umbrella.h"
18
15
  #import "RCTFabricComponentsPlugins.h"
19
16
  #import <React/RCTConversions.h>
20
17
  #import "UIView+AirMap.h"
package/ios/AirMaps/RNMapsMarkerView.mm CHANGED
@@ -10,10 +10,7 @@
10
10
  #import "AIRMap.h"
11
11
  #import "AIRMapMarker.h"
12
12
  #import "AIRMapMarkerManager.h"
13
- #import <react-native-maps-generated/ComponentDescriptors.h>
14
- #import <react-native-maps-generated/EventEmitters.h>
15
- #import <react-native-maps-generated/Props.h>
16
- #import <react-native-maps-generated/RCTComponentViewHelpers.h>
13
+ #import "react-native-maps-generated-umbrella.h"
17
14
  #import "RCTFabricComponentsPlugins.h"
18
15
  #import <React/RCTConversions.h>
19
16
  #import "UIView+AirMap.h"
package/ios/generated/module.modulemap ADDED
@@ -0,0 +1,4 @@
1
+ module react-native-maps-generated {
2
+ umbrella header "react-native-maps-generated-umbrella.h"
3
+ export RNMapsSpecs
4
+ }
package/ios/generated/react-native-maps-generated-umbrella.h ADDED
@@ -0,0 +1,14 @@
1
+ #ifndef REACT_NATIVE_MAPS_GENERATED_UMBRELLA_H
2
+ #define REACT_NATIVE_MAPS_GENERATED_UMBRELLA_H
3
+
4
+ #import "RNMapsSpecs/ComponentDescriptors.h"
5
+ #import "RNMapsSpecs/EventEmitters.h"
6
+ #import "RNMapsSpecs/Props.h"
7
+ #import "RNMapsSpecs/RCTComponentViewHelpers.h"
8
+ #import "RNMapsSpecs/RNMapsSpecs.h"
9
+
10
+ #endif /* REACT_NATIVE_MAPS_GENERATED_UMBRELLA_H */
11
+
12
+
13
+
14
+
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "main": "lib/index.js",
6
6
  "author": "Leland Richardson <leland.m.richardson@gmail.com>",
7
7
  "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
8
- "version": "1.21.0-alpha.89",
8
+ "version": "1.21.0-alpha.90",
9
9
  "license": "MIT",
10
10
  "scripts": {
11
11
  "lint": "eslint . --max-warnings 0",
package/react-native-maps.podspec CHANGED
@@ -1,23 +1,67 @@
1
1
  require 'json'
2
-
3
2
  package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
4
3
 
4
+ folly_config = get_folly_config()
5
+ folly_compiler_flags = folly_config[:compiler_flags]
6
+
5
7
  Pod::Spec.new do |s|
6
- s.name = "react-native-maps"
7
- s.version = package['version']
8
- s.summary = package["description"]
9
- s.authors = package["author"]
10
- s.homepage = package["homepage"]
11
- s.license = package["license"]
12
- s.platform = :ios, "13.0"
13
-
14
- s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
15
- s.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
16
- s.resource_bundles = {
17
- 'ReactNativeMapsPrivacy' => ['ios/PrivacyInfo.xcprivacy']
18
- }
19
- s.dependency 'react-native-maps-generated'
20
- s.dependency 'React-Core'
8
+ s.name = "react-native-maps"
9
+ s.version = package['version']
10
+ s.summary = package["description"]
11
+ s.authors = package["author"]
12
+ s.homepage = package["homepage"]
13
+ s.license = package["license"]
14
+ s.platform = :ios, "13.0"
15
+ s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
16
+
17
+ # Define the default base subspec
18
+ s.default_subspec = 'base'
19
+
20
+ # Base subspec for standard maps
21
+ s.subspec 'base' do |sp|
22
+ sp.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
23
+ sp.dependency "React-Core"
24
+ sp.dependency "react-native-maps/generated"
25
+ sp.compiler_flags = folly_compiler_flags
26
+ install_modules_dependencies(sp)
27
+ end
21
28
 
22
- install_modules_dependencies(s)
29
+ # Separate subspec for Google Maps support
30
+ s.subspec 'google-maps' do |sp|
31
+ sp.platform = :ios, "15.0"
32
+ sp.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
33
+ sp.resource_bundles = {
34
+ 'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
35
+ }
36
+ sp.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
37
+ sp.dependency "react-native-maps/generated"
38
+ sp.dependency 'GoogleMaps', '9.3.0'
39
+ sp.dependency 'Google-Maps-iOS-Utils', '6.1.0'
40
+ install_modules_dependencies(sp)
41
+ end
42
+
43
+ # Generated podspec as a subspec
44
+ s.subspec 'generated' do |sp|
45
+ sp.source_files = 'ios/generated/**/*.{h,m,mm,cpp}'
46
+ sp.exclude_files = [
47
+ 'ios/generated/**/RCTAppDependencyProvider.{h,mm}',
48
+ 'ios/generated/**/RCTThirdPartyComponentsProvider.{h,mm}',
49
+ 'ios/generated/**/RCTModulesConformingToProtocolsProvider.{h,mm}'
50
+ ]
51
+
52
+
53
+ sp.public_header_files = [
54
+ 'ios/generated/react-native-maps-generated-umbrella.h',
55
+ 'ios/generated/RNMapsSpecs/ComponentDescriptors.h',
56
+ 'ios/generated/RNMapsSpecs/EventEmitters.h',
57
+ 'ios/generated/RNMapsSpecs/Props.h',
58
+ 'ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h',
59
+ 'ios/generated/RNMapsSpecs/RNMapsSpecs.h'
60
+ ]
61
+ sp.header_mappings_dir = 'ios/generated'
62
+ sp.resource_bundles = {
63
+ 'ReactNativeMapsPrivacy' => ['ios/PrivacyInfo.xcprivacy']
64
+ }
65
+ install_modules_dependencies(sp)
66
+ end
23
67
  end