Update react and react-native (#49)

* update react and react-native * correctly set props of functional component * Minor tweaks; mostly improving the purge scripts * add example release configuration * fix propTypes for Page * Linter fixes --------- Co-authored-by: Ian Wagner <[email protected]>
maplibre · Jul 28, 2023 · a2b72b6 · a2b72b6
1 parent 5ba6c7e
commit a2b72b6
Show file tree

Hide file tree

Showing 90 changed files with 7,817 additions and 7,499 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
 

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/__tests__/__mocks__/react-native.mock.js b/__tests__/__mocks__/react-native.mock.js
@@ -10,3 +10,5 @@ jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter', () => {
     default: MockEventEmitter,
   };
 });
+
+jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.3"
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 16
         compileSdkVersion = 33
         targetSdkVersion = 33
@@ -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

diff --git a/android/rctmgl/build.gradle b/android/rctmgl/build.gradle
@@ -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"

diff --git a/example/.buckconfig b/example/.buckconfig
diff --git a/example/.gitignore b/example/.gitignore
@@ -27,6 +27,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -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
diff --git a/example/README.md b/example/README.md
@@ -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`
diff --git a/example/android/app/BUCK b/example/android/app/BUCK
-Original file line number
+Diff line change
@@ Expand Up @@
         default: MockEventEmitter,
       };
     });
+    jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');