diff --git a/RnDiffApp/.flowconfig b/RnDiffApp/.flowconfig index 7d5e2d336..3c0adb566 100644 --- a/RnDiffApp/.flowconfig +++ b/RnDiffApp/.flowconfig @@ -30,6 +30,19 @@ node_modules/react-native/flow-github/ emoji=true module.system=haste +module.system.haste.use_name_reducers=true +# get basename +module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1' +# strip .js or .js.flow suffix +module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1' +# strip .ios suffix +module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1' +module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1' +module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1' +module.system.haste.paths.blacklist=.*/__tests__/.* +module.system.haste.paths.blacklist=.*/__mocks__/.* +module.system.haste.paths.blacklist=/node_modules/react-native/Libraries/Animated/src/polyfills/.* +module.system.haste.paths.whitelist=/node_modules/react-native/Libraries/.* munge_underscores=true @@ -51,4 +64,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError [version] -^0.67.0 +^0.75.0 diff --git a/RnDiffApp/android/app/build.gradle b/RnDiffApp/android/app/build.gradle index c8ea1af3f..115f1e3d4 100644 --- a/RnDiffApp/android/app/build.gradle +++ b/RnDiffApp/android/app/build.gradle @@ -94,13 +94,13 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.rndiffapp" - minSdkVersion 16 - targetSdkVersion 22 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -138,7 +138,7 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:23.0.1" + compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" compile "com.facebook.react:react-native:+" // From node_modules } diff --git a/RnDiffApp/android/app/proguard-rules.pro b/RnDiffApp/android/app/proguard-rules.pro index 6e8516c8d..a92fa177e 100644 --- a/RnDiffApp/android/app/proguard-rules.pro +++ b/RnDiffApp/android/app/proguard-rules.pro @@ -15,56 +15,3 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} - -# Disabling obfuscation is useful if you collect stack traces from production crashes -# (unless you are using a system that supports de-obfuscate the stack traces). --dontobfuscate - -# React Native - -# Keep our interfaces so they can be used by other ProGuard rules. -# See http://sourceforge.net/p/proguard/bugs/466/ --keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip --keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters --keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip - -# Do not strip any method/class that is annotated with @DoNotStrip --keep @com.facebook.proguard.annotations.DoNotStrip class * --keep @com.facebook.common.internal.DoNotStrip class * --keepclassmembers class * { - @com.facebook.proguard.annotations.DoNotStrip *; - @com.facebook.common.internal.DoNotStrip *; -} - --keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * { - void set*(***); - *** get*(); -} - --keep class * extends com.facebook.react.bridge.JavaScriptModule { *; } --keep class * extends com.facebook.react.bridge.NativeModule { *; } --keepclassmembers,includedescriptorclasses class * { native ; } --keepclassmembers class * { @com.facebook.react.uimanager.UIProp ; } --keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactProp ; } --keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup ; } - --dontwarn com.facebook.react.** - -# TextLayoutBuilder uses a non-public Android constructor within StaticLayout. -# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details. --dontwarn android.text.StaticLayout - -# okhttp - --keepattributes Signature --keepattributes *Annotation* --keep class okhttp3.** { *; } --keep interface okhttp3.** { *; } --dontwarn okhttp3.** - -# okio - --keep class sun.misc.Unsafe { *; } --dontwarn java.nio.file.* --dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement --dontwarn okio.** diff --git a/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bccc..a2f590828 100644 Binary files a/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..1b5239980 Binary files /dev/null and b/RnDiffApp/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index c133a0cbd..ff10afd6e 100644 Binary files a/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..115a4c768 Binary files /dev/null and b/RnDiffApp/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0e7..dcd3cd808 100644 Binary files a/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..459ca609d Binary files /dev/null and b/RnDiffApp/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72cdd..8ca12fe02 100644 Binary files a/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..8e19b410a Binary files /dev/null and b/RnDiffApp/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/RnDiffApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..b824ebdd4 Binary files /dev/null and b/RnDiffApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/RnDiffApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/RnDiffApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..4c19a13c2 Binary files /dev/null and b/RnDiffApp/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/RnDiffApp/android/build.gradle b/RnDiffApp/android/build.gradle index eed9972b5..49569e4db 100644 --- a/RnDiffApp/android/build.gradle +++ b/RnDiffApp/android/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -20,5 +24,17 @@ allprojects { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } + maven { + url 'https://maven.google.com/' + name 'Google' + } } } + +ext { + buildToolsVersion = "26.0.3" + minSdkVersion = 16 + compileSdkVersion = 26 + targetSdkVersion = 26 + supportLibVersion = "26.1.0" +} diff --git a/RnDiffApp/android/gradle/wrapper/gradle-wrapper.properties b/RnDiffApp/android/gradle/wrapper/gradle-wrapper.properties index dbdc05d27..81a86e213 100644 --- a/RnDiffApp/android/gradle/wrapper/gradle-wrapper.properties +++ b/RnDiffApp/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip diff --git a/RnDiffApp/ios/RnDiffApp.xcodeproj/project.pbxproj b/RnDiffApp/ios/RnDiffApp.xcodeproj/project.pbxproj index 502b44b78..a9649b489 100644 --- a/RnDiffApp/ios/RnDiffApp.xcodeproj/project.pbxproj +++ b/RnDiffApp/ios/RnDiffApp.xcodeproj/project.pbxproj @@ -1173,7 +1173,7 @@ "$(inherited)", ); INFOPLIST_FILE = RnDiffAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", @@ -1190,7 +1190,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = RnDiffAppTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", @@ -1372,7 +1372,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1407,7 +1407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/RnDiffApp/package.json b/RnDiffApp/package.json index bcf5dc35e..f5ad811f3 100644 --- a/RnDiffApp/package.json +++ b/RnDiffApp/package.json @@ -6,7 +6,7 @@ "start": "node node_modules/react-native/local-cli/cli.js start" }, "dependencies": { - "react": "16.3.1", - "react-native": "0.55.4" + "react": "16.4.1", + "react-native": "0.56.0" } }