Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update react and react-native #49

Merged
merged 7 commits into from
Jul 28, 2023
Merged
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
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@ project.xcworkspace
/RNTester/android/app/gradlew.bat
/ReactAndroid/build/

# Buck
.buckd
buck-out
/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/
/ReactAndroid/src/main/jni/prebuilt/lib/x86/
/ReactAndroid/src/main/gen

# Watchman
.watchmanconfig

Expand Down
5,100 changes: 3,236 additions & 1,864 deletions .pnp.cjs

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Please add unreleased changes in the following style:
PR Title ([#123](link to my pr))
```

fix(markerview): make PointAnnotationProps component extend ViewProps ([#41](https://github.com/maplibre/maplibre-react-native/issues/41))

## 9.0.1
## 9.1.0

Update react to 18.2.0 and react-native to 0.72.1. ([#48](https://github.com/maplibre/maplibre-react-native/pull/48))
fix(markerview): make PointAnnotationProps component extend ViewProps ([#41](https://github.com/maplibre/maplibre-react-native/issues/41))
Fix build issue on iOS ([#29](https://github.com/maplibre/maplibre-react-native/issues/29))

## 9.0.0
Expand Down
2 changes: 2 additions & 0 deletions __tests__/__mocks__/react-native.mock.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter', () => {
default: MockEventEmitter,
};
});

jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext {
buildToolsVersion = "28.0.3"
buildToolsVersion = "33.0.0"
minSdkVersion = 16
compileSdkVersion = 33
targetSdkVersion = 33
Expand All @@ -13,7 +13,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
6 changes: 2 additions & 4 deletions android/rctmgl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

// React Native
implementation "com.facebook.react:react-native:+"
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")

// MapLibre SDK
implementation "org.maplibre.gl:android-sdk:9.6.0"
Expand Down
6 changes: 0 additions & 6 deletions example/.buckconfig

This file was deleted.

22 changes: 13 additions & 9 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace
ios/.xcode.env.local

# Android/IntelliJ
#
Expand All @@ -36,33 +37,36 @@ build/
local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
*.keystore
!debug.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots
**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# CocoaPods
/ios/Pods/
/ios/Podfile.lock

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*
# testing
/coverage
2 changes: 2 additions & 0 deletions example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,13 @@ yarn start

## Run Android Emulator

* If you want a clean build, run `yarn purge`
* Run `yarn android`

## Run iOS Simulator

You can run this with the react-native cli or by opening the Xcode project

* If you want a clean build, run `yarn purge` first.
* Run `yarn pod:install` if this is your first time to install pods
* Run `yarn ios`
55 changes: 0 additions & 55 deletions example/android/app/BUCK

This file was deleted.

Loading