Showing
18 changed files
with
129 additions
and
156 deletions
| @@ -20,7 +20,7 @@ import com.android.build.OutputFile | @@ -20,7 +20,7 @@ import com.android.build.OutputFile | ||
| 20 | * // default. Can be overridden with ENTRY_FILE environment variable. | 20 | * // default. Can be overridden with ENTRY_FILE environment variable. |
| 21 | * entryFile: "index.android.js", | 21 | * entryFile: "index.android.js", |
| 22 | * | 22 | * |
| 23 | - * // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format | 23 | + * // https://reactnative.dev/docs/performance#enable-the-ram-format |
| 24 | * bundleCommand: "ram-bundle", | 24 | * bundleCommand: "ram-bundle", |
| 25 | * | 25 | * |
| 26 | * // whether to bundle JS and assets in debug mode | 26 | * // whether to bundle JS and assets in debug mode |
| @@ -161,20 +161,13 @@ android { | @@ -161,20 +161,13 @@ android { | ||
| 161 | } | 161 | } |
| 162 | release { | 162 | release { |
| 163 | // Caution! In production, you need to generate your own keystore file. | 163 | // Caution! In production, you need to generate your own keystore file. |
| 164 | - // see https://facebook.github.io/react-native/docs/signed-apk-android. | 164 | + // see https://reactnative.dev/docs/signed-apk-android. |
| 165 | signingConfig signingConfigs.debug | 165 | signingConfig signingConfigs.debug |
| 166 | minifyEnabled enableProguardInReleaseBuilds | 166 | minifyEnabled enableProguardInReleaseBuilds |
| 167 | proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" | 167 | proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" |
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | - packagingOptions { | ||
| 172 | - pickFirst "lib/armeabi-v7a/libc++_shared.so" | ||
| 173 | - pickFirst "lib/arm64-v8a/libc++_shared.so" | ||
| 174 | - pickFirst "lib/x86/libc++_shared.so" | ||
| 175 | - pickFirst "lib/x86_64/libc++_shared.so" | ||
| 176 | - } | ||
| 177 | - | ||
| 178 | // applicationVariants are e.g. debug, release | 171 | // applicationVariants are e.g. debug, release |
| 179 | applicationVariants.all { variant -> | 172 | applicationVariants.all { variant -> |
| 180 | variant.outputs.each { output -> | 173 | variant.outputs.each { output -> |
| @@ -211,6 +204,7 @@ dependencies { | @@ -211,6 +204,7 @@ dependencies { | ||
| 211 | 204 | ||
| 212 | debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { | 205 | debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { |
| 213 | exclude group:'com.facebook.flipper' | 206 | exclude group:'com.facebook.flipper' |
| 207 | + exclude group:'com.squareup.okhttp3', module:'okhttp' | ||
| 214 | } | 208 | } |
| 215 | 209 | ||
| 216 | debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { | 210 | debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { |
| @@ -12,8 +12,7 @@ buildscript { | @@ -12,8 +12,7 @@ buildscript { | ||
| 12 | jcenter() | 12 | jcenter() |
| 13 | } | 13 | } |
| 14 | dependencies { | 14 | dependencies { |
| 15 | - classpath("com.android.tools.build:gradle:3.5.2") | 15 | + classpath("com.android.tools.build:gradle:3.5.3") |
| 16 | - | ||
| 17 | // NOTE: Do not place your application dependencies here; they belong | 16 | // NOTE: Do not place your application dependencies here; they belong |
| 18 | // in the individual module build.gradle files | 17 | // in the individual module build.gradle files |
| 19 | } | 18 | } |
| @@ -25,4 +25,4 @@ android.useAndroidX=true | @@ -25,4 +25,4 @@ android.useAndroidX=true | ||
| 25 | android.enableJetifier=true | 25 | android.enableJetifier=true |
| 26 | 26 | ||
| 27 | # Version of flipper SDK to use with React Native | 27 | # Version of flipper SDK to use with React Native |
| 28 | -FLIPPER_VERSION=0.33.1 | 28 | +FLIPPER_VERSION=0.37.0 |
No preview for this file type
| 1 | distributionBase=GRADLE_USER_HOME | 1 | distributionBase=GRADLE_USER_HOME |
| 2 | distributionPath=wrapper/dists | 2 | distributionPath=wrapper/dists |
| 3 | -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip | 3 | +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip |
| 4 | zipStoreBase=GRADLE_USER_HOME | 4 | zipStoreBase=GRADLE_USER_HOME |
| 5 | zipStorePath=wrapper/dists | 5 | zipStorePath=wrapper/dists |
| @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then | @@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then | ||
| 154 | else | 154 | else |
| 155 | eval `echo args$i`="\"$arg\"" | 155 | eval `echo args$i`="\"$arg\"" |
| 156 | fi | 156 | fi |
| 157 | - i=$((i+1)) | 157 | + i=`expr $i + 1` |
| 158 | done | 158 | done |
| 159 | case $i in | 159 | case $i in |
| 160 | - (0) set -- ;; | 160 | + 0) set -- ;; |
| 161 | - (1) set -- "$args0" ;; | 161 | + 1) set -- "$args0" ;; |
| 162 | - (2) set -- "$args0" "$args1" ;; | 162 | + 2) set -- "$args0" "$args1" ;; |
| 163 | - (3) set -- "$args0" "$args1" "$args2" ;; | 163 | + 3) set -- "$args0" "$args1" "$args2" ;; |
| 164 | - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; | 164 | + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; |
| 165 | - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | 165 | + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; |
| 166 | - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | 166 | + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; |
| 167 | - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | 167 | + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; |
| 168 | - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | 168 | + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; |
| 169 | - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | 169 | + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; |
| 170 | esac | 170 | esac |
| 171 | fi | 171 | fi |
| 172 | 172 | ||
| @@ -175,14 +175,9 @@ save () { | @@ -175,14 +175,9 @@ save () { | ||
| 175 | for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done | 175 | for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done |
| 176 | echo " " | 176 | echo " " |
| 177 | } | 177 | } |
| 178 | -APP_ARGS=$(save "$@") | 178 | +APP_ARGS=`save "$@"` |
| 179 | 179 | ||
| 180 | # Collect all arguments for the java command, following the shell quoting and substitution rules | 180 | # Collect all arguments for the java command, following the shell quoting and substitution rules |
| 181 | eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" | 181 | eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" |
| 182 | 182 | ||
| 183 | -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong | ||
| 184 | -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then | ||
| 185 | - cd "$(dirname "$0")" | ||
| 186 | -fi | ||
| 187 | - | ||
| 188 | exec "$JAVACMD" "$@" | 183 | exec "$JAVACMD" "$@" |
| @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. | @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. | ||
| 29 | set APP_BASE_NAME=%~n0 | 29 | set APP_BASE_NAME=%~n0 |
| 30 | set APP_HOME=%DIRNAME% | 30 | set APP_HOME=%DIRNAME% |
| 31 | 31 | ||
| 32 | +@rem Resolve any "." and ".." in APP_HOME to make it shorter. | ||
| 33 | +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi | ||
| 34 | + | ||
| 32 | @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | 35 | @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. |
| 33 | set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" | 36 | set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" |
| 34 | 37 |
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | <key>CFBundleExecutable</key> | 7 | <key>CFBundleExecutable</key> |
| 8 | <string>$(EXECUTABLE_NAME)</string> | 8 | <string>$(EXECUTABLE_NAME)</string> |
| 9 | <key>CFBundleIdentifier</key> | 9 | <key>CFBundleIdentifier</key> |
| 10 | - <string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string> | 10 | + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> |
| 11 | <key>CFBundleInfoDictionaryVersion</key> | 11 | <key>CFBundleInfoDictionaryVersion</key> |
| 12 | <string>6.0</string> | 12 | <string>6.0</string> |
| 13 | <key>CFBundleName</key> | 13 | <key>CFBundleName</key> |
This diff is collapsed. Click to expand it.
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | #import <React/RCTRootView.h> | 13 | #import <React/RCTRootView.h> |
| 14 | #import "RNQuickActionManager.h" | 14 | #import "RNQuickActionManager.h" |
| 15 | 15 | ||
| 16 | -#if DEBUG | 16 | +#if FB_SONARKIT_ENABLED |
| 17 | #import <FlipperKit/FlipperClient.h> | 17 | #import <FlipperKit/FlipperClient.h> |
| 18 | #import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h> | 18 | #import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h> |
| 19 | #import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h> | 19 | #import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h> |
| @@ -36,7 +36,7 @@ static void InitializeFlipper(UIApplication *application) { | @@ -36,7 +36,7 @@ static void InitializeFlipper(UIApplication *application) { | ||
| 36 | 36 | ||
| 37 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions | 37 | - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions |
| 38 | { | 38 | { |
| 39 | -#if DEBUG | 39 | +#if FB_SONARKIT_ENABLED |
| 40 | InitializeFlipper(application); | 40 | InitializeFlipper(application); |
| 41 | #endif | 41 | #endif |
| 42 | 42 |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM"> | ||
| 3 | + <device id="retina4_7" orientation="portrait" appearance="light"/> | ||
| 4 | + <dependencies> | ||
| 5 | + <deployment identifier="iOS"/> | ||
| 6 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/> | ||
| 7 | + <capability name="Safe area layout guides" minToolsVersion="9.0"/> | ||
| 8 | + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| 9 | + </dependencies> | ||
| 10 | + <scenes> | ||
| 11 | + <!--View Controller--> | ||
| 12 | + <scene sceneID="EHf-IW-A2E"> | ||
| 13 | + <objects> | ||
| 14 | + <viewController id="01J-lp-oVM" sceneMemberID="viewController"> | ||
| 15 | + <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> | ||
| 16 | + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | ||
| 17 | + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
| 18 | + <subviews> | ||
| 19 | + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd"> | ||
| 20 | + <rect key="frame" x="0.0" y="647" width="375" height="0.0"/> | ||
| 21 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 22 | + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| 23 | + <nil key="highlightedColor"/> | ||
| 24 | + </label> | ||
| 25 | + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NGPlay" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb"> | ||
| 26 | + <rect key="frame" x="0.0" y="202" width="375" height="43"/> | ||
| 27 | + <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/> | ||
| 28 | + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| 29 | + <nil key="highlightedColor"/> | ||
| 30 | + </label> | ||
| 31 | + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="MN2-I3-ftu"> | ||
| 32 | + <rect key="frame" x="0.0" y="626" width="375" height="21"/> | ||
| 33 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 34 | + <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> | ||
| 35 | + <nil key="highlightedColor"/> | ||
| 36 | + </label> | ||
| 37 | + </subviews> | ||
| 38 | + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| 39 | + <constraints> | ||
| 40 | + <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/> | ||
| 41 | + <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="MN2-I3-ftu" secondAttribute="bottom" constant="20" id="OZV-Vh-mqD"/> | ||
| 42 | + <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/> | ||
| 43 | + <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/> | ||
| 44 | + <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/> | ||
| 45 | + <constraint firstItem="MN2-I3-ftu" firstAttribute="centerX" secondItem="Bcu-3y-fUS" secondAttribute="centerX" id="akx-eg-2ui"/> | ||
| 46 | + <constraint firstItem="MN2-I3-ftu" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="i1E-0Y-4RG"/> | ||
| 47 | + <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/> | ||
| 48 | + <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/> | ||
| 49 | + </constraints> | ||
| 50 | + <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/> | ||
| 51 | + </view> | ||
| 52 | + </viewController> | ||
| 53 | + <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> | ||
| 54 | + </objects> | ||
| 55 | + <point key="canvasLocation" x="52.173913043478265" y="375"/> | ||
| 56 | + </scene> | ||
| 57 | + </scenes> | ||
| 58 | +</document> |
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES"> | ||
| 3 | - <device id="retina6_1" orientation="portrait" appearance="light"/> | ||
| 4 | - <dependencies> | ||
| 5 | - <deployment identifier="iOS"/> | ||
| 6 | - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/> | ||
| 7 | - <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| 8 | - </dependencies> | ||
| 9 | - <objects> | ||
| 10 | - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| 11 | - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| 12 | - <view contentMode="scaleToFill" id="iN0-l3-epB"> | ||
| 13 | - <rect key="frame" x="0.0" y="0.0" width="480" height="480"/> | ||
| 14 | - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
| 15 | - <subviews> | ||
| 16 | - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye"> | ||
| 17 | - <rect key="frame" x="20" y="439" width="441" height="21"/> | ||
| 18 | - <fontDescription key="fontDescription" type="system" pointSize="17"/> | ||
| 19 | - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> | ||
| 20 | - <nil key="highlightedColor"/> | ||
| 21 | - </label> | ||
| 22 | - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="NGPlay" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX"> | ||
| 23 | - <rect key="frame" x="20" y="140" width="441" height="43"/> | ||
| 24 | - <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/> | ||
| 25 | - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> | ||
| 26 | - <nil key="highlightedColor"/> | ||
| 27 | - </label> | ||
| 28 | - </subviews> | ||
| 29 | - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | ||
| 30 | - <constraints> | ||
| 31 | - <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/> | ||
| 32 | - <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/> | ||
| 33 | - <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/> | ||
| 34 | - <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/> | ||
| 35 | - <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/> | ||
| 36 | - <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/> | ||
| 37 | - </constraints> | ||
| 38 | - <nil key="simulatedStatusBarMetrics"/> | ||
| 39 | - <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> | ||
| 40 | - <point key="canvasLocation" x="548" y="455"/> | ||
| 41 | - </view> | ||
| 42 | - </objects> | ||
| 43 | -</document> |
| @@ -2,37 +2,52 @@ | @@ -2,37 +2,52 @@ | ||
| 2 | "images" : [ | 2 | "images" : [ |
| 3 | { | 3 | { |
| 4 | "idiom" : "iphone", | 4 | "idiom" : "iphone", |
| 5 | - "size" : "29x29", | 5 | + "scale" : "2x", |
| 6 | - "scale" : "2x" | 6 | + "size" : "20x20" |
| 7 | }, | 7 | }, |
| 8 | { | 8 | { |
| 9 | "idiom" : "iphone", | 9 | "idiom" : "iphone", |
| 10 | - "size" : "29x29", | 10 | + "scale" : "3x", |
| 11 | - "scale" : "3x" | 11 | + "size" : "20x20" |
| 12 | }, | 12 | }, |
| 13 | { | 13 | { |
| 14 | "idiom" : "iphone", | 14 | "idiom" : "iphone", |
| 15 | - "size" : "40x40", | 15 | + "scale" : "2x", |
| 16 | - "scale" : "2x" | 16 | + "size" : "29x29" |
| 17 | }, | 17 | }, |
| 18 | { | 18 | { |
| 19 | "idiom" : "iphone", | 19 | "idiom" : "iphone", |
| 20 | - "size" : "40x40", | 20 | + "scale" : "3x", |
| 21 | - "scale" : "3x" | 21 | + "size" : "29x29" |
| 22 | }, | 22 | }, |
| 23 | { | 23 | { |
| 24 | "idiom" : "iphone", | 24 | "idiom" : "iphone", |
| 25 | - "size" : "60x60", | 25 | + "scale" : "2x", |
| 26 | - "scale" : "2x" | 26 | + "size" : "40x40" |
| 27 | }, | 27 | }, |
| 28 | { | 28 | { |
| 29 | "idiom" : "iphone", | 29 | "idiom" : "iphone", |
| 30 | - "size" : "60x60", | 30 | + "scale" : "3x", |
| 31 | - "scale" : "3x" | 31 | + "size" : "40x40" |
| 32 | + }, | ||
| 33 | + { | ||
| 34 | + "idiom" : "iphone", | ||
| 35 | + "scale" : "2x", | ||
| 36 | + "size" : "60x60" | ||
| 37 | + }, | ||
| 38 | + { | ||
| 39 | + "idiom" : "iphone", | ||
| 40 | + "scale" : "3x", | ||
| 41 | + "size" : "60x60" | ||
| 42 | + }, | ||
| 43 | + { | ||
| 44 | + "idiom" : "ios-marketing", | ||
| 45 | + "scale" : "1x", | ||
| 46 | + "size" : "1024x1024" | ||
| 32 | } | 47 | } |
| 33 | ], | 48 | ], |
| 34 | "info" : { | 49 | "info" : { |
| 35 | - "version" : 1, | 50 | + "author" : "xcode", |
| 36 | - "author" : "xcode" | 51 | + "version" : 1 |
| 37 | } | 52 | } |
| 38 | } | 53 | } |
| 1 | 1 | ||
| 2 | -/* Class = "UILabel"; text = "Powered by React Native"; ObjectID = "8ie-xW-0ye"; */ | 2 | +/* Class = "UILabel"; text = "NGPlay"; ObjectID = "GJd-Yh-RWb"; */ |
| 3 | -"8ie-xW-0ye.text" = "React Native"; | 3 | +"GJd-Yh-RWb.text" = "NGPlay"; |
| 4 | 4 | ||
| 5 | -/* Class = "UILabel"; text = "NGPlay"; ObjectID = "kId-c2-rCX"; */ | 5 | +/* Class = "UILabel"; text = "Powered by React Native"; ObjectID = "MN2-I3-ftu"; */ |
| 6 | -"kId-c2-rCX.text" = "NGPlay"; | 6 | +"MN2-I3-ftu.text" = "React Native"; |
| 1 | -platform :ios, '9.0' | 1 | +require_relative '../node_modules/react-native/scripts/react_native_pods' |
| 2 | require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' | 2 | require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' |
| 3 | 3 | ||
| 4 | -def add_flipper_pods! | 4 | +platform :ios, '10.0' |
| 5 | - version = '~> 0.37.0' | ||
| 6 | - pod 'FlipperKit', version, :configuration => 'Debug' | ||
| 7 | - pod 'FlipperKit/FlipperKitLayoutPlugin', version, :configuration => 'Debug' | ||
| 8 | - pod 'FlipperKit/SKIOSNetworkPlugin', version, :configuration => 'Debug' | ||
| 9 | - pod 'FlipperKit/FlipperKitUserDefaultsPlugin', version, :configuration => 'Debug' | ||
| 10 | - pod 'FlipperKit/FlipperKitReactPlugin', version, :configuration => 'Debug' | ||
| 11 | -end | ||
| 12 | - | ||
| 13 | -# Post Install processing for Flipper | ||
| 14 | -def flipper_post_install(installer) | ||
| 15 | - installer.pods_project.targets.each do |target| | ||
| 16 | - if target.name == 'YogaKit' | ||
| 17 | - target.build_configurations.each do |config| | ||
| 18 | - config.build_settings['SWIFT_VERSION'] = '4.1' | ||
| 19 | - end | ||
| 20 | - end | ||
| 21 | - end | ||
| 22 | -end | ||
| 23 | 5 | ||
| 24 | target 'NGPlay' do | 6 | target 'NGPlay' do |
| 25 | - # Pods for NGPlay | 7 | + config = use_native_modules! |
| 26 | - pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" | ||
| 27 | - pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec" | ||
| 28 | - pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" | ||
| 29 | - pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety" | ||
| 30 | - pod 'React', :path => '../node_modules/react-native/' | ||
| 31 | - pod 'React-Core', :path => '../node_modules/react-native/' | ||
| 32 | - pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' | ||
| 33 | - pod 'React-Core/DevSupport', :path => '../node_modules/react-native/' | ||
| 34 | - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' | ||
| 35 | - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' | ||
| 36 | - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' | ||
| 37 | - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' | ||
| 38 | - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' | ||
| 39 | - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' | ||
| 40 | - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' | ||
| 41 | - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' | ||
| 42 | - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' | ||
| 43 | - pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/' | ||
| 44 | 8 | ||
| 45 | - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' | 9 | + use_react_native!(:path => config["reactNativePath"]) |
| 46 | - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' | ||
| 47 | - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' | ||
| 48 | - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' | ||
| 49 | - pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon" | ||
| 50 | - pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" | ||
| 51 | - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true | ||
| 52 | - | ||
| 53 | - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' | ||
| 54 | - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' | ||
| 55 | - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' | ||
| 56 | 10 | ||
| 57 | # RNPermission start | 11 | # RNPermission start |
| 58 | permissions_path = '../node_modules/react-native-permissions/ios' | 12 | permissions_path = '../node_modules/react-native-permissions/ios' |
| @@ -80,13 +34,11 @@ target 'NGPlay' do | @@ -80,13 +34,11 @@ target 'NGPlay' do | ||
| 80 | # Pods for testing | 34 | # Pods for testing |
| 81 | end | 35 | end |
| 82 | 36 | ||
| 83 | - use_native_modules! | ||
| 84 | - | ||
| 85 | # Enables Flipper. | 37 | # Enables Flipper. |
| 86 | # | 38 | # |
| 87 | # Note that if you have use_frameworks! enabled, Flipper will not work and | 39 | # Note that if you have use_frameworks! enabled, Flipper will not work and |
| 88 | # you should disable these next few lines. | 40 | # you should disable these next few lines. |
| 89 | - add_flipper_pods! | 41 | + use_flipper! |
| 90 | post_install do |installer| | 42 | post_install do |installer| |
| 91 | flipper_post_install(installer) | 43 | flipper_post_install(installer) |
| 92 | end | 44 | end |
This diff is collapsed. Click to expand it.
| @@ -25,8 +25,8 @@ | @@ -25,8 +25,8 @@ | ||
| 25 | "@react-navigation/native": "^5.1.4", | 25 | "@react-navigation/native": "^5.1.4", |
| 26 | "@react-navigation/stack": "^5.2.9", | 26 | "@react-navigation/stack": "^5.2.9", |
| 27 | "immer": "^6.0.3", | 27 | "immer": "^6.0.3", |
| 28 | - "react": "16.11.0", | 28 | + "react": "16.13.1", |
| 29 | - "react-native": "0.62.1", | 29 | + "react-native": "0.63.2", |
| 30 | "react-native-camera": "^3.23.1", | 30 | "react-native-camera": "^3.23.1", |
| 31 | "react-native-dark-mode": "^0.2.2", | 31 | "react-native-dark-mode": "^0.2.2", |
| 32 | "react-native-device-info": "^5.5.4", | 32 | "react-native-device-info": "^5.5.4", |
| @@ -54,13 +54,13 @@ | @@ -54,13 +54,13 @@ | ||
| 54 | "url-parse": "^1.4.7" | 54 | "url-parse": "^1.4.7" |
| 55 | }, | 55 | }, |
| 56 | "devDependencies": { | 56 | "devDependencies": { |
| 57 | - "@babel/core": "^7.6.2", | 57 | + "@babel/core": "^7.8.4", |
| 58 | - "@babel/runtime": "^7.6.2", | 58 | + "@babel/runtime": "^7.8.4", |
| 59 | "@commitlint/cli": "^8.3.5", | 59 | "@commitlint/cli": "^8.3.5", |
| 60 | "@commitlint/config-conventional": "^8.3.4", | 60 | "@commitlint/config-conventional": "^8.3.4", |
| 61 | - "@react-native-community/eslint-config": "^1.0.0", | 61 | + "@react-native-community/eslint-config": "^1.1.0", |
| 62 | "@types/jest": "^24.0.24", | 62 | "@types/jest": "^24.0.24", |
| 63 | - "@types/react-native": "^0.62.0", | 63 | + "@types/react-native": "^0.63.4", |
| 64 | "@types/react-redux": "^7.1.7", | 64 | "@types/react-redux": "^7.1.7", |
| 65 | "@types/react-test-renderer": "16.9.2", | 65 | "@types/react-test-renderer": "16.9.2", |
| 66 | "@types/redux-logger": "^3.0.7", | 66 | "@types/redux-logger": "^3.0.7", |
| @@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
| 68 | "@typescript-eslint/eslint-plugin": "^2.27.0", | 68 | "@typescript-eslint/eslint-plugin": "^2.27.0", |
| 69 | "@typescript-eslint/parser": "^2.27.0", | 69 | "@typescript-eslint/parser": "^2.27.0", |
| 70 | "@welldone-software/why-did-you-render": "^4.0.7", | 70 | "@welldone-software/why-did-you-render": "^4.0.7", |
| 71 | - "babel-jest": "^24.9.0", | 71 | + "babel-jest": "^25.1.0", |
| 72 | "commitizen": "^4.0.3", | 72 | "commitizen": "^4.0.3", |
| 73 | "cz-conventional-changelog": "^3.1.0", | 73 | "cz-conventional-changelog": "^3.1.0", |
| 74 | "eslint": "^6.8.0", | 74 | "eslint": "^6.8.0", |
| @@ -77,9 +77,9 @@ | @@ -77,9 +77,9 @@ | ||
| 77 | "husky": "^4.2.3", | 77 | "husky": "^4.2.3", |
| 78 | "jest": "^24.9.0", | 78 | "jest": "^24.9.0", |
| 79 | "lint-staged": "^10.1.2", | 79 | "lint-staged": "^10.1.2", |
| 80 | - "metro-react-native-babel-preset": "^0.58.0", | 80 | + "metro-react-native-babel-preset": "^0.59.0", |
| 81 | "prettier": "^2.0.4", | 81 | "prettier": "^2.0.4", |
| 82 | - "react-test-renderer": "16.11.0", | 82 | + "react-test-renderer": "16.13.1", |
| 83 | "standard-version": "^7.1.0", | 83 | "standard-version": "^7.1.0", |
| 84 | "typescript": "^3.8.3" | 84 | "typescript": "^3.8.3" |
| 85 | }, | 85 | }, |
This diff is collapsed. Click to expand it.
-
Please register or login to post a comment