status-im
/
react-native-webview
mirror of https://github.com/status-im/react-native-webview.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(compatibility): Support React Native 0.62 (#1364 by @jussikinnula and @kaiguo) 

Co-authored-by: Kai Guo <kaigu@microsoft.com>
Co-authored-by: Jamon Holmgren <jamonholmgren@gmail.com>
This commit is contained in:
Jussi Kinnula 2020-05-27 06:55:02 +03:00 committed by GitHub
parent 89886c820d
commit 228f10d917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 1692 additions and 2460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/android/build.gradle
View File

@ -12,7 +12,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:3.4.2") classpath("com.android.tools.build:gradle:3.5.2")
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -33,6 +33,6 @@ allprojects {
google() google()
jcenter() jcenter()
maven { url 'https://jitpack.io' } maven { url 'https://www.jitpack.io' }
} }
} }

2
example/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
example/android/gradlew vendored
View File

@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # https://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
@ -126,7 +126,7 @@ if $darwin; then
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`

6
example/ios/Podfile
View File

@ -31,9 +31,9 @@ target 'example' do
pod 'React-jsi', :path => '../../node_modules/react-native/ReactCommon/jsi' pod 'React-jsi', :path => '../../node_modules/react-native/ReactCommon/jsi'
pod 'React-jsiexecutor', :path => '../../node_modules/react-native/ReactCommon/jsiexecutor' pod 'React-jsiexecutor', :path => '../../node_modules/react-native/ReactCommon/jsiexecutor'
pod 'React-jsinspector', :path => '../../node_modules/react-native/ReactCommon/jsinspector' pod 'React-jsinspector', :path => '../../node_modules/react-native/ReactCommon/jsinspector'
pod 'ReactCommon/jscallinvoker', :path => "../../node_modules/react-native/ReactCommon" pod 'ReactCommon/callinvoker', :path => "../../node_modules/react-native/ReactCommon"
pod 'ReactCommon/turbomodule/core', :path => "../../node_modules/react-native/ReactCommon" pod 'ReactCommon/turbomodule/core', :path => "../../node_modules/react-native/ReactCommon"
pod 'Yoga', :path => '../../node_modules/react-native/ReactCommon/yoga' pod 'Yoga', :path => '../../node_modules/react-native/ReactCommon/yoga', :modular_headers => true
pod 'DoubleConversion', :podspec => '../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' pod 'DoubleConversion', :podspec => '../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'glog', :podspec => '../../node_modules/react-native/third-party-podspecs/glog.podspec' pod 'glog', :podspec => '../../node_modules/react-native/third-party-podspecs/glog.podspec'
@ -49,7 +49,7 @@ target 'example-tvOS' do
# Pods for example-tvOS # Pods for example-tvOS
target 'example-tvOSTests' do target 'example-tvOSTests' do
inherit! :search_paths inherit! :complete
# Pods for testing # Pods for testing
end end

338
example/ios/Podfile.lock
View File

@ -1,14 +1,14 @@
PODS: PODS:
- boost-for-react-native (1.63.0) - boost-for-react-native (1.63.0)
- DoubleConversion (1.1.6) - DoubleConversion (1.1.6)
- FBLazyVector (0.61.5) - FBLazyVector (0.62.2)
- FBReactNativeSpec (0.61.5): - FBReactNativeSpec (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- RCTRequired (= 0.61.5) - RCTRequired (= 0.62.2)
- RCTTypeSafety (= 0.61.5) - RCTTypeSafety (= 0.62.2)
- React-Core (= 0.61.5) - React-Core (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.61.5) - ReactCommon/turbomodule/core (= 0.62.2)
- Folly (2018.10.22.00): - Folly (2018.10.22.00):
- boost-for-react-native - boost-for-react-native
- DoubleConversion - DoubleConversion
@ -19,206 +19,230 @@ PODS:
- DoubleConversion - DoubleConversion
- glog - glog
- glog (0.3.5) - glog (0.3.5)
- RCTRequired (0.61.5) - RCTRequired (0.62.2)
- RCTTypeSafety (0.61.5): - RCTTypeSafety (0.62.2):
- FBLazyVector (= 0.61.5) - FBLazyVector (= 0.62.2)
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- RCTRequired (= 0.61.5) - RCTRequired (= 0.62.2)
- React-Core (= 0.61.5) - React-Core (= 0.62.2)
- React (0.61.5): - React (0.62.2):
- React-Core (= 0.61.5) - React-Core (= 0.62.2)
- React-Core/DevSupport (= 0.61.5) - React-Core/DevSupport (= 0.62.2)
- React-Core/RCTWebSocket (= 0.61.5) - React-Core/RCTWebSocket (= 0.62.2)
- React-RCTActionSheet (= 0.61.5) - React-RCTActionSheet (= 0.62.2)
- React-RCTAnimation (= 0.61.5) - React-RCTAnimation (= 0.62.2)
- React-RCTBlob (= 0.61.5) - React-RCTBlob (= 0.62.2)
- React-RCTImage (= 0.61.5) - React-RCTImage (= 0.62.2)
- React-RCTLinking (= 0.61.5) - React-RCTLinking (= 0.62.2)
- React-RCTNetwork (= 0.61.5) - React-RCTNetwork (= 0.62.2)
- React-RCTSettings (= 0.61.5) - React-RCTSettings (= 0.62.2)
- React-RCTText (= 0.61.5) - React-RCTText (= 0.62.2)
- React-RCTVibration (= 0.61.5) - React-RCTVibration (= 0.62.2)
- React-Core (0.61.5): - React-Core (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default (= 0.61.5) - React-Core/Default (= 0.62.2)
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/CoreModulesHeaders (0.61.5): - React-Core/CoreModulesHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/Default (0.61.5): - React-Core/Default (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/DevSupport (0.61.5): - React-Core/DevSupport (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default (= 0.61.5) - React-Core/Default (= 0.62.2)
- React-Core/RCTWebSocket (= 0.61.5) - React-Core/RCTWebSocket (= 0.62.2)
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- React-jsinspector (= 0.61.5) - React-jsinspector (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTActionSheetHeaders (0.61.5): - React-Core/RCTActionSheetHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTAnimationHeaders (0.61.5): - React-Core/RCTAnimationHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTBlobHeaders (0.61.5): - React-Core/RCTBlobHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTImageHeaders (0.61.5): - React-Core/RCTImageHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTLinkingHeaders (0.61.5): - React-Core/RCTLinkingHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTNetworkHeaders (0.61.5): - React-Core/RCTNetworkHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTSettingsHeaders (0.61.5): - React-Core/RCTSettingsHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTTextHeaders (0.61.5): - React-Core/RCTTextHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTVibrationHeaders (0.61.5): - React-Core/RCTVibrationHeaders (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default - React-Core/Default
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-Core/RCTWebSocket (0.61.5): - React-Core/RCTWebSocket (0.62.2):
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core/Default (= 0.61.5) - React-Core/Default (= 0.62.2)
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsiexecutor (= 0.61.5) - React-jsiexecutor (= 0.62.2)
- Yoga - Yoga
- React-CoreModules (0.61.5): - React-CoreModules (0.62.2):
- FBReactNativeSpec (= 0.61.5) - FBReactNativeSpec (= 0.62.2)
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- RCTTypeSafety (= 0.61.5) - RCTTypeSafety (= 0.62.2)
- React-Core/CoreModulesHeaders (= 0.61.5) - React-Core/CoreModulesHeaders (= 0.62.2)
- React-RCTImage (= 0.61.5) - React-RCTImage (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.61.5) - ReactCommon/turbomodule/core (= 0.62.2)
- React-cxxreact (0.61.5): - React-cxxreact (0.62.2):
- boost-for-react-native (= 1.63.0) - boost-for-react-native (= 1.63.0)
- DoubleConversion - DoubleConversion
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-jsinspector (= 0.61.5) - React-jsinspector (= 0.62.2)
- React-jsi (0.61.5): - React-jsi (0.62.2):
- boost-for-react-native (= 1.63.0) - boost-for-react-native (= 1.63.0)
- DoubleConversion - DoubleConversion
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-jsi/Default (= 0.61.5) - React-jsi/Default (= 0.62.2)
- React-jsi/Default (0.61.5): - React-jsi/Default (0.62.2):
- boost-for-react-native (= 1.63.0) - boost-for-react-native (= 1.63.0)
- DoubleConversion - DoubleConversion
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-jsiexecutor (0.61.5): - React-jsiexecutor (0.62.2):
- DoubleConversion - DoubleConversion
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- React-jsinspector (0.61.5) - React-jsinspector (0.62.2)
- react-native-webview (9.3.0): - react-native-webview (9.4.0):
- React - React
- React-RCTActionSheet (0.61.5): - React-RCTActionSheet (0.62.2):
- React-Core/RCTActionSheetHeaders (= 0.61.5) - React-Core/RCTActionSheetHeaders (= 0.62.2)
- React-RCTAnimation (0.61.5): - React-RCTAnimation (0.62.2):
- React-Core/RCTAnimationHeaders (= 0.61.5) - FBReactNativeSpec (= 0.62.2)
- React-RCTBlob (0.61.5): - Folly (= 2018.10.22.00)
- React-Core/RCTBlobHeaders (= 0.61.5) - RCTTypeSafety (= 0.62.2)
- React-Core/RCTWebSocket (= 0.61.5) - React-Core/RCTAnimationHeaders (= 0.62.2)
- React-jsi (= 0.61.5) - ReactCommon/turbomodule/core (= 0.62.2)
- React-RCTNetwork (= 0.61.5) - React-RCTBlob (0.62.2):
- React-RCTImage (0.61.5): - FBReactNativeSpec (= 0.62.2)
- React-Core/RCTImageHeaders (= 0.61.5) - Folly (= 2018.10.22.00)
- React-RCTNetwork (= 0.61.5) - React-Core/RCTBlobHeaders (= 0.62.2)
- React-RCTLinking (0.61.5): - React-Core/RCTWebSocket (= 0.62.2)
- React-Core/RCTLinkingHeaders (= 0.61.5) - React-jsi (= 0.62.2)
- React-RCTNetwork (0.61.5): - React-RCTNetwork (= 0.62.2)
- React-Core/RCTNetworkHeaders (= 0.61.5) - ReactCommon/turbomodule/core (= 0.62.2)
- React-RCTSettings (0.61.5): - React-RCTImage (0.62.2):
- React-Core/RCTSettingsHeaders (= 0.61.5) - FBReactNativeSpec (= 0.62.2)
- React-RCTText (0.61.5): - Folly (= 2018.10.22.00)
- React-Core/RCTTextHeaders (= 0.61.5) - RCTTypeSafety (= 0.62.2)
- React-RCTVibration (0.61.5): - React-Core/RCTImageHeaders (= 0.62.2)
- React-Core/RCTVibrationHeaders (= 0.61.5) - React-RCTNetwork (= 0.62.2)
- ReactCommon/jscallinvoker (0.61.5): - ReactCommon/turbomodule/core (= 0.62.2)
- React-RCTLinking (0.62.2):
- FBReactNativeSpec (= 0.62.2)
- React-Core/RCTLinkingHeaders (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.62.2)
- React-RCTNetwork (0.62.2):
- FBReactNativeSpec (= 0.62.2)
- Folly (= 2018.10.22.00)
- RCTTypeSafety (= 0.62.2)
- React-Core/RCTNetworkHeaders (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.62.2)
- React-RCTSettings (0.62.2):
- FBReactNativeSpec (= 0.62.2)
- Folly (= 2018.10.22.00)
- RCTTypeSafety (= 0.62.2)
- React-Core/RCTSettingsHeaders (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.62.2)
- React-RCTText (0.62.2):
- React-Core/RCTTextHeaders (= 0.62.2)
- React-RCTVibration (0.62.2):
- FBReactNativeSpec (= 0.62.2)
- Folly (= 2018.10.22.00)
- React-Core/RCTVibrationHeaders (= 0.62.2)
- ReactCommon/turbomodule/core (= 0.62.2)
- ReactCommon/callinvoker (0.62.2):
- DoubleConversion - DoubleConversion
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- ReactCommon/turbomodule/core (0.61.5): - ReactCommon/turbomodule/core (0.62.2):
- DoubleConversion - DoubleConversion
- Folly (= 2018.10.22.00) - Folly (= 2018.10.22.00)
- glog - glog
- React-Core (= 0.61.5) - React-Core (= 0.62.2)
- React-cxxreact (= 0.61.5) - React-cxxreact (= 0.62.2)
- React-jsi (= 0.61.5) - React-jsi (= 0.62.2)
- ReactCommon/jscallinvoker (= 0.61.5) - ReactCommon/callinvoker (= 0.62.2)
- Yoga (1.14.0) - Yoga (1.14.0)
DEPENDENCIES: DEPENDENCIES:
@ -248,7 +272,7 @@ DEPENDENCIES:
- React-RCTSettings (from `../../node_modules/react-native/Libraries/Settings`) - React-RCTSettings (from `../../node_modules/react-native/Libraries/Settings`)
- React-RCTText (from `../../node_modules/react-native/Libraries/Text`) - React-RCTText (from `../../node_modules/react-native/Libraries/Text`)
- React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`) - React-RCTVibration (from `../../node_modules/react-native/Libraries/Vibration`)
- ReactCommon/jscallinvoker (from `../../node_modules/react-native/ReactCommon`) - ReactCommon/callinvoker (from `../../node_modules/react-native/ReactCommon`)
- ReactCommon/turbomodule/core (from `../../node_modules/react-native/ReactCommon`) - ReactCommon/turbomodule/core (from `../../node_modules/react-native/ReactCommon`)
- Yoga (from `../../node_modules/react-native/ReactCommon/yoga`) - Yoga (from `../../node_modules/react-native/ReactCommon/yoga`)
@ -313,32 +337,32 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245
FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
glog: 1f3da668190260b06b429bb211bfbee5cd790c28 glog: 1f3da668190260b06b429bb211bfbee5cd790c28
RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 RCTRequired: cec6a34b3ac8a9915c37e7e4ad3aa74726ce4035
RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 RCTTypeSafety: 93006131180074cffa227a1075802c89a49dd4ce
React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 React: 29a8b1a02bd764fb7644ef04019270849b9a7ac3
React-Core: 688b451f7d616cc1134ac95295b593d1b5158a04 React-Core: b12bffb3f567fdf99510acb716ef1abd426e0e05
React-CoreModules: d04f8494c1a328b69ec11db9d1137d667f916dcb React-CoreModules: 4a9b87bbe669d6c3173c0132c3328e3b000783d0
React-cxxreact: d0f7bcafa196ae410e5300736b424455e7fb7ba7 React-cxxreact: e65f9c2ba0ac5be946f53548c1aaaee5873a8103
React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7 React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161
React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386 React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da
React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0 React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493
react-native-webview: 60d883f994e96a560756c14592552e02a06d604d react-native-webview: cf5527893252b3b036eea024a1da6996f7344c74
React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360 React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0
React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72 React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71
React-RCTImage: 6b8e8df449eb7c814c99a92d6b52de6fe39dea4e React-RCTImage: e70be9b9c74fe4e42d0005f42cace7981c994ac3
React-RCTLinking: 121bb231c7503cf9094f4d8461b96a130fabf4a5 React-RCTLinking: c1b9739a88d56ecbec23b7f63650e44672ab2ad2
React-RCTNetwork: fb353640aafcee84ca8b78957297bd395f065c9a React-RCTNetwork: 73138b6f45e5a2768ad93f3d57873c2a18d14b44
React-RCTSettings: 8db258ea2a5efee381fcf7a6d5044e2f8b68b640 React-RCTSettings: 6e3738a87e21b39a8cb08d627e68c44acf1e325a
React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d
React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256
ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b Yoga: 3ebccbdd559724312790e7742142d062476b698e
PODFILE CHECKSUM: c2e136f84288494fa269d79892a8a1cf7acd7c71 PODFILE CHECKSUM: 767ae042fafc1aba97b301c58c340ff6f992aa27
COCOAPODS: 1.8.4 COCOAPODS: 1.9.1

18
example/ios/example.xcodeproj/project.pbxproj
View File

@ -16,7 +16,7 @@
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2DCD954D1E0B4F2C00145EB5 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; }; 2DCD954D1E0B4F2C00145EB5 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
A08B6FFAAF3CA0F03003FEB0 /* libPods-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5544B310E076E06B9E2EFF4C /* libPods-example-tvOSTests.a */; }; 646BD8E8CDDF5A464B5419B3 /* libPods-example-tvOS-example-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4830F7139A954350DD22DE4A /* libPods-example-tvOS-example-tvOSTests.a */; };
C7D826CF866C25BE421302B6 /* libPods-example-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */; }; C7D826CF866C25BE421302B6 /* libPods-example-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */; };
D0E3313DFCE78BFCB650F812 /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB301596D47BBAD9E9C0A45A /* libPods-exampleTests.a */; }; D0E3313DFCE78BFCB650F812 /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB301596D47BBAD9E9C0A45A /* libPods-exampleTests.a */; };
E719A6E171791CD8906B3D55 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 917A19FC1EBE6E8B85FE404D /* libPods-example.a */; }; E719A6E171791CD8906B3D55 /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 917A19FC1EBE6E8B85FE404D /* libPods-example.a */; };
@ -55,9 +55,10 @@
2D02E4901E0B4A5D006451C7 /* example-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "example-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* example-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "example-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
41B6A4553C4F552488B69B01 /* Pods-exampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.release.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.release.xcconfig"; sourceTree = "<group>"; }; 41B6A4553C4F552488B69B01 /* Pods-exampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.release.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.release.xcconfig"; sourceTree = "<group>"; };
4372A2FD2D749DE5C9FD8D3E /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = "<group>"; }; 4372A2FD2D749DE5C9FD8D3E /* Pods-example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.debug.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.debug.xcconfig"; sourceTree = "<group>"; };
4830F7139A954350DD22DE4A /* libPods-example-tvOS-example-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS-example-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4FDD34C422D711AC8A7B10A7 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = "<group>"; }; 4FDD34C422D711AC8A7B10A7 /* Pods-example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example.release.xcconfig"; path = "Target Support Files/Pods-example/Pods-example.release.xcconfig"; sourceTree = "<group>"; };
5544B310E076E06B9E2EFF4C /* libPods-example-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.release.xcconfig"; sourceTree = "<group>"; }; 59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
6517B8E7187010A1D58A96EE /* Pods-example-tvOS-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS-example-tvOSTests/Pods-example-tvOS-example-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
775F6B7492793F5DB7ECE95B /* Pods-example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.debug.xcconfig"; sourceTree = "<group>"; }; 775F6B7492793F5DB7ECE95B /* Pods-example-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
8A20011E75A0AD2EC5C6EAE9 /* Pods-exampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.debug.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.debug.xcconfig"; sourceTree = "<group>"; }; 8A20011E75A0AD2EC5C6EAE9 /* Pods-exampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-exampleTests.debug.xcconfig"; path = "Target Support Files/Pods-exampleTests/Pods-exampleTests.debug.xcconfig"; sourceTree = "<group>"; };
917A19FC1EBE6E8B85FE404D /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 917A19FC1EBE6E8B85FE404D /* libPods-example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -65,6 +66,7 @@
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
EDF80BE96CF92848F4E926EA /* Pods-example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.release.xcconfig"; sourceTree = "<group>"; }; EDF80BE96CF92848F4E926EA /* Pods-example-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS/Pods-example-tvOS.release.xcconfig"; sourceTree = "<group>"; };
EE3925F4209E17ECF3E692D1 /* Pods-example-tvOS-example-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOS-example-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-example-tvOS-example-tvOSTests/Pods-example-tvOS-example-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
F67BC8D73DE103BA10A5488D /* Pods-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; }; F67BC8D73DE103BA10A5488D /* Pods-example-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-example-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-example-tvOSTests/Pods-example-tvOSTests.debug.xcconfig"; sourceTree = "<group>"; };
F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-example-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -98,7 +100,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
A08B6FFAAF3CA0F03003FEB0 /* libPods-example-tvOSTests.a in Frameworks */, 646BD8E8CDDF5A464B5419B3 /* libPods-example-tvOS-example-tvOSTests.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -143,8 +145,8 @@
ED2971642150620600B7C4FE /* JavaScriptCore.framework */, ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
917A19FC1EBE6E8B85FE404D /* libPods-example.a */, 917A19FC1EBE6E8B85FE404D /* libPods-example.a */,
F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */, F9A8A9F158876EC099CFA57A /* libPods-example-tvOS.a */,
5544B310E076E06B9E2EFF4C /* libPods-example-tvOSTests.a */,
CB301596D47BBAD9E9C0A45A /* libPods-exampleTests.a */, CB301596D47BBAD9E9C0A45A /* libPods-exampleTests.a */,
4830F7139A954350DD22DE4A /* libPods-example-tvOS-example-tvOSTests.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
@ -193,6 +195,8 @@
59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */, 59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */,
8A20011E75A0AD2EC5C6EAE9 /* Pods-exampleTests.debug.xcconfig */, 8A20011E75A0AD2EC5C6EAE9 /* Pods-exampleTests.debug.xcconfig */,
41B6A4553C4F552488B69B01 /* Pods-exampleTests.release.xcconfig */, 41B6A4553C4F552488B69B01 /* Pods-exampleTests.release.xcconfig */,
6517B8E7187010A1D58A96EE /* Pods-example-tvOS-example-tvOSTests.debug.xcconfig */,
EE3925F4209E17ECF3E692D1 /* Pods-example-tvOS-example-tvOSTests.release.xcconfig */,
); );
path = Pods; path = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
@ -402,7 +406,7 @@
outputFileListPaths = ( outputFileListPaths = (
); );
outputPaths = ( outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-example-tvOSTests-checkManifestLockResult.txt", "$(DERIVED_FILE_DIR)/Pods-example-tvOS-example-tvOSTests-checkManifestLockResult.txt",
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
@ -718,7 +722,7 @@
}; };
2D02E4991E0B4A5E006451C7 /* Debug */ = { 2D02E4991E0B4A5E006451C7 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = F67BC8D73DE103BA10A5488D /* Pods-example-tvOSTests.debug.xcconfig */; baseConfigurationReference = 6517B8E7187010A1D58A96EE /* Pods-example-tvOS-example-tvOSTests.debug.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
@ -745,7 +749,7 @@
}; };
2D02E49A1E0B4A5E006451C7 /* Release */ = { 2D02E49A1E0B4A5E006451C7 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 59A4F27CAD1B7EFE80917453 /* Pods-example-tvOSTests.release.xcconfig */; baseConfigurationReference = EE3925F4209E17ECF3E692D1 /* Pods-example-tvOS-example-tvOSTests.release.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;

45
example/ios/example.xcodeproj/xcshareddata/xcschemes/example-tvOS.xcscheme
View File

@ -1,25 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0940" LastUpgradeVersion = "1130"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "NO" parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"> buildImplicitDependencies = "YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D2A28121D9B038B00D4039D"
BuildableName = "libReact.a"
BlueprintName = "React-tvOS"
ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry <BuildActionEntry
buildForTesting = "YES" buildForTesting = "YES"
buildForRunning = "YES" buildForRunning = "YES"
@ -34,20 +20,6 @@
ReferencedContainer = "container:example.xcodeproj"> ReferencedContainer = "container:example.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E48F1E0B4A5D006451C7"
BuildableName = "example-tvOSTests.xctest"
BlueprintName = "example-tvOSTests"
ReferencedContainer = "container:example.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction <TestAction
@ -67,17 +39,6 @@
</BuildableReference> </BuildableReference>
</TestableReference> </TestableReference>
</Testables> </Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2D02E47A1E0B4A5D006451C7"
BuildableName = "example-tvOS.app"
BlueprintName = "example-tvOS"
ReferencedContainer = "container:example.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Debug"
@ -99,8 +60,6 @@
ReferencedContainer = "container:example.xcodeproj"> ReferencedContainer = "container:example.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"

45
example/ios/example.xcodeproj/xcshareddata/xcschemes/example.xcscheme
View File

@ -1,25 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0940" LastUpgradeVersion = "1130"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "NO" parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"> buildImplicitDependencies = "YES">
<BuildActionEntries> <BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
BuildableName = "libReact.a"
BlueprintName = "React"
ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry <BuildActionEntry
buildForTesting = "YES" buildForTesting = "YES"
buildForRunning = "YES" buildForRunning = "YES"
@ -34,20 +20,6 @@
ReferencedContainer = "container:example.xcodeproj"> ReferencedContainer = "container:example.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "exampleTests.xctest"
BlueprintName = "exampleTests"
ReferencedContainer = "container:example.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction <TestAction
@ -67,17 +39,6 @@
</BuildableReference> </BuildableReference>
</TestableReference> </TestableReference>
</Testables> </Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "example.app"
BlueprintName = "example"
ReferencedContainer = "container:example.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug" buildConfiguration = "Debug"
@ -99,8 +60,6 @@
ReferencedContainer = "container:example.xcodeproj"> ReferencedContainer = "container:example.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"

1
example/windows/WebViewWindows.sln
View File

@ -55,6 +55,7 @@ Global
..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 ..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
..\..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
..\..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
EndGlobalSection EndGlobalSection

5
example/windows/WebViewWindows/App.cpp
View File

@ -37,11 +37,6 @@ App::App() noexcept
PackageProviders().Append(winrt::ReactNativeWebView::ReactPackageProvider()); PackageProviders().Append(winrt::ReactNativeWebView::ReactPackageProvider());
InitializeComponent(); InitializeComponent();
// This works around a cpp/winrt bug with composable/aggregable types tracked
// by 22116519
AddRef();
m_inner.as<::IUnknown>()->Release();
} }

7
example/windows/WebViewWindows/WebViewWindows.vcxproj
View File

@ -161,12 +161,11 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<PropertyGroup> <PropertyGroup>
<BundleCommand> <BundleEntryFile>example/index.js</BundleEntryFile>
cd $(SolutionDir)..\.. <BundlerExtraArgs>--use-react-native-windows</BundlerExtraArgs>
npx react-native bundle --platform windows --entry-file example/index.js --bundle-output example/windows/WebViewWindows/Bundle/index.windows.bundle --assets-dest example/windows/WebViewWindows/Bundle --use-react-native-windows
</BundleCommand>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets" /> <Import Project="..\..\..\node_modules\react-native-windows\PropertySheets\Bundle.Cpp.targets" />
<Import Project="..\..\..\node_modules\react-native-windows\PropertySheets\Bundle.props" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" /> <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="$(SolutionDir)packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" /> <Import Project="$(SolutionDir)packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.UI.Xaml.2.3.191129002\build\native\Microsoft.UI.Xaml.targets')" />

28
package.json
View File

@ -12,8 +12,8 @@
"homepage": "https://github.com/react-native-community/react-native-webview#readme", "homepage": "https://github.com/react-native-community/react-native-webview#readme",
"scripts": { "scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start", "start": "node node_modules/react-native/local-cli/cli.js start",
"start:android": "react-native run-android --root example/", "start:android": "react-native run-android",
"start:ios": "react-native run-ios --project-path example/ios --scheme example", "start:ios": "react-native run-ios",
"start:macos": "node node_modules/react-native-macos/local-cli/cli.js start --use-react-native-macos", "start:macos": "node node_modules/react-native-macos/local-cli/cli.js start --use-react-native-macos",
"start:windows": "react-native start --use-react-native-windows", "start:windows": "react-native start --use-react-native-windows",
"ci": "CI=true && yarn lint", "ci": "CI=true && yarn lint",
@ -29,8 +29,8 @@
"type": "Component" "type": "Component"
}, },
"peerDependencies": { "peerDependencies": {
"react": "^16.9", "react": "16.11.0",
"react-native": ">=0.60 <0.62" "react-native": ">=0.60 <0.63"
}, },
"dependencies": { "dependencies": {
"escape-string-regexp": "2.0.0", "escape-string-regexp": "2.0.0",
@ -39,14 +39,14 @@
"devDependencies": { "devDependencies": {
"@babel/core": "7.4.5", "@babel/core": "7.4.5",
"@babel/runtime": "7.4.5", "@babel/runtime": "7.4.5",
"@react-native-community/cli": "^3.2.0", "@react-native-community/cli": "^4.8.0",
"@react-native-community/cli-platform-android": "^3.0.0", "@react-native-community/cli-platform-android": "^4.8.0",
"@react-native-community/cli-platform-ios": "^3.0.0", "@react-native-community/cli-platform-ios": "^4.8.0",
"@semantic-release/git": "7.0.16", "@semantic-release/git": "7.0.16",
"@types/invariant": "^2.2.30", "@types/invariant": "^2.2.30",
"@types/jest": "24.0.18", "@types/jest": "24.0.18",
"@types/react": "16.8.8", "@types/react": "16.9.34",
"@types/react-native": "0.60.11", "@types/react-native": "0.62.5",
"@types/selenium-webdriver": "4.0.9", "@types/selenium-webdriver": "4.0.9",
"@typescript-eslint/eslint-plugin": "2.1.0", "@typescript-eslint/eslint-plugin": "2.1.0",
"@typescript-eslint/parser": "2.1.0", "@typescript-eslint/parser": "2.1.0",
@ -62,13 +62,13 @@
"eslint-plugin-react-native": "3.7.0", "eslint-plugin-react-native": "3.7.0",
"jest": "24.9.0", "jest": "24.9.0",
"metro": "0.56.4", "metro": "0.56.4",
"metro-react-native-babel-preset": "0.54.1", "metro-react-native-babel-preset": "^0.59.0",
"react": "16.9.0", "react": "16.11.0",
"react-native": "0.61.5", "react-native": "0.62.2",
"react-native-macos": "0.60.0-microsoft.73", "react-native-macos": "0.60.0-microsoft.73",
"react-native-windows": "0.61.5", "react-native-windows": "^0.62.0-0",
"semantic-release": "15.13.24", "semantic-release": "15.13.24",
"typescript": "3.6.2", "typescript": "3.8.3",
"appium": "1.17.0", "appium": "1.17.0",
"selenium-appium": "0.0.15", "selenium-appium": "0.0.15",
"selenium-webdriver": "4.0.0-alpha.7" "selenium-webdriver": "4.0.0-alpha.7"

14
react-native.config.js
View File

@ -15,6 +15,8 @@
*/ */
'use strict'; 'use strict';
const path = require('path');
const macSwitch = '--use-react-native-macos'; const macSwitch = '--use-react-native-macos';
const windowsSwitch = '--use-react-native-windows'; const windowsSwitch = '--use-react-native-windows';
@ -32,3 +34,15 @@ else if (process.argv.includes(windowsSwitch)) {
reactNativePath: 'node_modules/react-native-windows', reactNativePath: 'node_modules/react-native-windows',
}; };
} }
else {
module.exports = {
project: {
ios: {
project: 'example/ios/',
},
android: {
sourceDir: 'example/android',
},
},
};
}

19
src/WebView.tsx
View File

@ -1,5 +1,20 @@
// This files provides compatibility without tree platform. import React from 'react';
import { WebView } from 'react-native'; import { View } from 'react-native';
import { IOSWebViewProps, AndroidWebViewProps } from './WebViewTypes';
export type WebViewProps = IOSWebViewProps & AndroidWebViewProps;
// This "dummy" WebView is to render something for unsupported platforms,
// like for example Expo SDK "web" platform. It matches the previous react-native
// implementation which is produced by Expo SDK 37.0.0.1 implementation, with
// similar interface than the native ones have.
const WebView: React.FunctionComponent<WebViewProps> = () => (
<View style={{
alignSelf: 'flex-start',
borderColor: 'rgb(255, 0, 0)',
borderWidth: 1
}} />
);
export { WebView }; export { WebView };
export default WebView; export default WebView;

54
windows/ReactNativeWebView/ReactWebViewManager.cpp
View File

@ -101,42 +101,40 @@ namespace winrt::ReactNativeWebView::implementation {
} }
// IViewManagerWithCommands // IViewManagerWithCommands
IMapView<hstring, int64_t> ReactWebViewManager::Commands() noexcept { IVectorView<hstring> ReactWebViewManager::Commands() noexcept {
auto commands = winrt::single_threaded_map<hstring, int64_t>(); auto commands = winrt::single_threaded_vector<hstring>();
commands.Insert(L"goForward", static_cast<int32_t>(WebViewCommands::GoForward)); commands.Append(L"goForward");
commands.Insert(L"goBack", static_cast<int32_t>(WebViewCommands::GoBack)); commands.Append(L"goBack");
commands.Insert(L"reload", static_cast<int32_t>(WebViewCommands::Reload)); commands.Append(L"reload");
commands.Insert(L"stopLoading", static_cast<int32_t>(WebViewCommands::StopLoading)); commands.Append(L"stopLoading");
commands.Insert(L"injectJavaScript", static_cast<int32_t>(WebViewCommands::InjectJavaScript)); commands.Append(L"injectJavaScript");
return commands.GetView(); return commands.GetView();
} }
void ReactWebViewManager::DispatchCommand( void ReactWebViewManager::DispatchCommand(
FrameworkElement const& view, FrameworkElement const& view,
int64_t commandId, winrt::hstring const& commandId,
winrt::IJSValueReader const& commandArgsReader) noexcept { winrt::IJSValueReader const& commandArgsReader) noexcept {
auto commandArgs = JSValue::ReadArrayFrom(commandArgsReader); auto commandArgs = JSValue::ReadArrayFrom(commandArgsReader);
if (auto webView = view.try_as<winrt::WebView>()) { if (auto webView = view.try_as<winrt::WebView>()) {
switch (commandId) { if (commandId == L"goForward") {
case static_cast<int64_t>(WebViewCommands::GoForward) : if (webView.CanGoForward()) {
if (webView.CanGoForward()) { webView.GoForward();
webView.GoForward(); }
} }
break; else if (commandId == L"goBack") {
case static_cast<int64_t>(WebViewCommands::GoBack) : if (webView.CanGoBack()) {
if (webView.CanGoBack()) { webView.GoBack();
webView.GoBack(); }
} }
break; else if (commandId == L"reload") {
case static_cast<int64_t>(WebViewCommands::Reload) : webView.Refresh();
webView.Refresh(); }
break; else if (commandId == L"stopLoading") {
case static_cast<int64_t>(WebViewCommands::StopLoading) : webView.Stop();
webView.Stop(); }
break; else if (commandId == L"injectJavaScript") {
case static_cast<int64_t>(WebViewCommands::InjectJavaScript) : webView.InvokeScriptAsync(L"eval", { winrt::to_hstring(commandArgs[0].AsString()) });
webView.InvokeScriptAsync(L"eval", { winrt::to_hstring(commandArgs[0].AsString()) });
break;
} }
} }
} }

6
windows/ReactNativeWebView/ReactWebViewManager.h
View File

@ -8,8 +8,6 @@
namespace winrt::ReactNativeWebView::implementation { namespace winrt::ReactNativeWebView::implementation {
enum class WebViewCommands : int32_t { GoForward = 0, GoBack = 1, Reload = 2, StopLoading = 3, InjectJavaScript = 4 };
class ReactWebViewManager : public winrt::implements< class ReactWebViewManager : public winrt::implements<
ReactWebViewManager, ReactWebViewManager,
winrt::Microsoft::ReactNative::IViewManager, winrt::Microsoft::ReactNative::IViewManager,
@ -41,11 +39,11 @@ namespace winrt::ReactNativeWebView::implementation {
winrt::Microsoft::ReactNative::ConstantProviderDelegate ExportedCustomDirectEventTypeConstants() noexcept; winrt::Microsoft::ReactNative::ConstantProviderDelegate ExportedCustomDirectEventTypeConstants() noexcept;
// IViewManagerWithCommands // IViewManagerWithCommands
winrt::Windows::Foundation::Collections::IMapView<winrt::hstring, int64_t> Commands() noexcept; winrt::Windows::Foundation::Collections::IVectorView<winrt::hstring> Commands() noexcept;
void DispatchCommand( void DispatchCommand(
winrt::Windows::UI::Xaml::FrameworkElement const& view, winrt::Windows::UI::Xaml::FrameworkElement const& view,
int64_t commandId, winrt::hstring const& commandId,
winrt::Microsoft::ReactNative::IJSValueReader const& commandArgsReader) noexcept; winrt::Microsoft::ReactNative::IJSValueReader const& commandArgsReader) noexcept;
private: private:

3554
yarn.lock
View File

File diff suppressed because it is too large Load Diff