Skip to content

Commit

Permalink
Patch example dependency (#248)
Browse files Browse the repository at this point in the history
* implemented fix

* add print statements

* added logging

* possible problem with new calls

* removed console logs

* fixed spelling

* added patch

* remove accidentally added files

* get example app running on ios

* added some buttons

* added more buttons

* remove comments

* remove key

* move all the stuff into app.js

* Update App.js

---------

Co-authored-by: Liam Meier <[email protected]>
  • Loading branch information
KennyHuRadar and lmeier authored Aug 14, 2023
1 parent 65ba34d commit db21c04
Show file tree
Hide file tree
Showing 14 changed files with 41,384 additions and 8,316 deletions.
758 changes: 463 additions & 295 deletions example/App.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ android {
}

dependencies {
implementation ("androidx.appcompat:appcompat:1.3.1") {
version {
strictly '1.3.1'
}
}
implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
Expand Down
8 changes: 8 additions & 0 deletions example/components/exampleButton.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from "react";
import { Button } from "react-native";

const ExampleButton = ({ title, onPress }) => {
return <Button title={title} onPress={onPress} />;
};

export default ExampleButton;
2 changes: 2 additions & 0 deletions example/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { registerRootComponent } from 'expo';
import { AppRegistry, Platform } from "react-native";

import App from './App';

// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
// It also ensures that whether you load the app in the Expo client or in a native build,
// the environment is set up appropriately
registerRootComponent(App);
AppRegistry.registerComponent('main', () => App);
25 changes: 25 additions & 0 deletions example/ios/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@
dependencies = (
);
name = example;
packageProductDependencies = (
FB1CCB4375883670E1B467DC /* Mapbox */,
);
productName = example;
productReference = 13B07F961A680F5B00A75B9A /* example.app */;
productType = "com.apple.product-type.application";
Expand All @@ -184,6 +187,9 @@
Base,
);
mainGroup = 83CBB9F61A601CBA00E9B192;
packageReferences = (
6FC9EBE22B510A5B864EA2AA /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */,
);
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -486,6 +492,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
6FC9EBE22B510A5B864EA2AA /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution";
requirement = {
kind = exactVersion;
version = 5.13.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
FB1CCB4375883670E1B467DC /* Mapbox */ = {
isa = XCSwiftPackageProductDependency;
package = 6FC9EBE22B510A5B864EA2AA /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = Mapbox;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
}
2 changes: 2 additions & 0 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ target 'example' do

post_install do |installer|
react_native_post_install(installer)
$RNMBGL.post_install(installer)


# Workaround `Cycle inside FBReactNativeSpec` error for react-native 0.64
# Reference: https://github.com/software-mansion/react-native-screens/issues/842#issuecomment-812543933
Expand Down
33 changes: 22 additions & 11 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PODS:
- DoubleConversion (1.1.6)
- EXApplication (4.0.2):
- ExpoModulesCore
- EXConstants (12.0.0):
- EXConstants (12.1.3):
- ExpoModulesCore
- EXFileSystem (13.0.3):
- ExpoModulesCore
Expand Down Expand Up @@ -41,7 +41,14 @@ PODS:
- React-jsi (= 0.64.3)
- ReactCommon/turbomodule/core (= 0.64.3)
- glog (0.3.5)
- RadarSDK (3.5.9)
- maplibre-react-native (9.0.1):
- maplibre-react-native/DynamicLibrary (= 9.0.1)
- React
- React-Core
- maplibre-react-native/DynamicLibrary (9.0.1):
- React
- React-Core
- RadarSDK (3.8.4)
- RCT-Folly (2020.01.13.00):
- boost-for-react-native
- DoubleConversion
Expand Down Expand Up @@ -235,8 +242,8 @@ PODS:
- React-jsi (= 0.64.3)
- React-perflogger (= 0.64.3)
- React-jsinspector (0.64.3)
- react-native-radar (3.5.8):
- RadarSDK (~> 3.5.9)
- react-native-radar (3.8.4):
- RadarSDK (~> 3.8.4)
- React
- react-native-safe-area-context (3.3.2):
- React-Core
Expand Down Expand Up @@ -362,6 +369,7 @@ DEPENDENCIES:
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- "maplibre-react-native (from `../node_modules/@maplibre/maplibre-react-native`)"
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
Expand All @@ -375,7 +383,7 @@ DEPENDENCIES:
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
- react-native-radar (from `../node_modules/react-native-radar`)
- react-native-radar (from `../..`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
Expand Down Expand Up @@ -438,6 +446,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/React/FBReactNativeSpec"
glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
maplibre-react-native:
:path: "../node_modules/@maplibre/maplibre-react-native"
RCT-Folly:
:podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
RCTRequired:
Expand All @@ -461,7 +471,7 @@ EXTERNAL SOURCES:
React-jsinspector:
:path: "../node_modules/react-native/ReactCommon/jsinspector"
react-native-radar:
:path: "../node_modules/react-native-radar"
:path: "../.."
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
React-perflogger:
Expand Down Expand Up @@ -505,7 +515,7 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
EXApplication: 54fe5bd6268d697771645e8f1aef8b806a65247a
EXConstants: b14b472da01b8191c1cfe86f29caa1e0c6a46bed
EXConstants: 6d585d93723b18d7a8c283591a335609e3bc153e
EXFileSystem: 99aac7962c11c680681819dd9cbca24e20e5b1e7
EXFont: 2597c10ac85a69d348d44d7873eccf5a7576ef5e
EXImageLoader: 939451be6f7b731aaa6588920b90743f20121a4d
Expand All @@ -519,9 +529,10 @@ SPEC CHECKSUMS:
EXUpdates: 061b67c33f0e7f8fd335bbb48697c4a4fc8a5157
EXUpdatesInterface: e1c01b4f5ec76bd1d6cc714938f9edf5ef6379b9
FBLazyVector: c71c5917ec0ad2de41d5d06a5855f6d5eda06971
FBReactNativeSpec: 49e3b1196c098eae8fa4c35c55441b8906659966
FBReactNativeSpec: d55cc83d9dc993d9832c60fb5343bf811f1cd092
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
RadarSDK: 9c3b51e9aafcd35d7d80fd4d0d81d9feca36490e
maplibre-react-native: f08cc1b867c4b3080b34955f8e2ce938361df4c2
RadarSDK: 00aac8132174517cd0de9b43af0aa168edaf5a4c
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
RCTRequired: d34bf57e17cb6e3b2681f4809b13843c021feb6c
RCTTypeSafety: 8dab4933124ed39bb0c1d88d74d61b1eb950f28f
Expand All @@ -533,7 +544,7 @@ SPEC CHECKSUMS:
React-jsi: a8b09c29521c798f1783348b37b511ba7b3dbeb3
React-jsiexecutor: df6abc9fafbecb8e5b7a5fbc5e6d4bd017d594d5
React-jsinspector: 34e23860273a23695342f58eed3ffd3ba10c31e0
react-native-radar: 46e9349505e71d8fb28ca0d43929c05e22303ed9
react-native-radar: 120e6fb7d2c87fe3ea917a5e83a86e53e36eee3c
react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
React-perflogger: cc76a4254d19640f1d8ad1c66fdee800414b805c
React-RCTActionSheet: 7448f049318d8d7e8a9a1ebb742ada721757eea8
Expand All @@ -554,6 +565,6 @@ SPEC CHECKSUMS:
UMTaskManagerInterface: 5654c50e68af11b19b9d05452bacf23d19b3f30f
Yoga: e6ecf3fa25af9d4c87e94ad7d5d292eedef49749

PODFILE CHECKSUM: 24051a3ecfdb115a8c042c84c1f821c9b67c036d
PODFILE CHECKSUM: ac3241f9540525d739bc6e1ec2f5381dee057b14

COCOAPODS: 1.11.3
Loading

0 comments on commit db21c04

Please sign in to comment.