diff --git a/.gitignore b/.gitignore index 6b290712dbd6d4..246036cb9dad1d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ buck-out .gradle local.properties *.iml -/android/ +#/android/ #local maven repo. # Node node_modules diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index bc67d865d8eceb..f5ae6232ebae48 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -13,6 +13,6 @@ exports.version = { major: 0, minor: 55, - patch: 4, + patch: 5, prerelease: null, }; diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index 95d02acb788a99..dc6834ae9b0a4f 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -34,6 +34,10 @@ import com.android.build.OutputFile * // the root of your project, i.e. where "package.json" lives * root: "../../", * + * // path to react cli commands + * // IMPORTANT: this path is relative to the defined 'root' + * cliPath: "node_modules/react-native/local-cli/cli.js" + * * // where to put the JS bundle asset in debug mode * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", * @@ -60,7 +64,8 @@ import com.android.build.OutputFile project.ext.react = [ bundleAssetName: "RNTesterApp.android.bundle", entryFile: file("../../js/RNTesterApp.android.js"), - root: "../../../../", + cliPath: "./local-cli/cli.js", + root: "../../../", inputExcludes: ["android/**", "./**"] ] @@ -75,7 +80,7 @@ apply from: "../../../react.gradle" * Upload all the APKs to the Play Store and people will download * the correct one based on the CPU architecture of their device. */ -def enableSeparateBuildPerCPUArchitecture = false +def enableSeparateBuildPerCPUArchitecture = true /** * Run Proguard to shrink the Java bytecode in release builds. @@ -92,9 +97,6 @@ android { targetSdkVersion 23 versionCode 1 versionName "1.0" - ndk { - abiFilters "armeabi-v7a", "x86" - } } signingConfigs { release { @@ -109,7 +111,7 @@ android { enable enableSeparateBuildPerCPUArchitecture universalApk false reset() - include "armeabi-v7a", "x86" + include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } } buildTypes { @@ -124,7 +126,7 @@ android { variant.outputs.each { output -> // For each separate APK per architecture, set a unique version code as described here: // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits - def versionCodes = ["armeabi-v7a":1, "x86":2] + def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a":3, "x86_64":4] def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = diff --git a/RNTester/android/app/gradle.properties b/RNTester/android/app/gradle.properties index 74027349d96fa2..80147647b917d5 100644 --- a/RNTester/android/app/gradle.properties +++ b/RNTester/android/app/gradle.properties @@ -1,4 +1,3 @@ -android.useDeprecatedNdk=true MYAPP_RELEASE_STORE_FILE=my-release-key.keystore MYAPP_RELEASE_KEY_ALIAS=my-key-alias MYAPP_RELEASE_STORE_PASSWORD=***** diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m index aeb997451f2e42..4d934802f12dac 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -22,7 +22,7 @@ static void __makeVersion() __rnVersion = @{ RCTVersionMajor: @(0), RCTVersionMinor: @(55), - RCTVersionPatch: @(4), + RCTVersionPatch: @(5), RCTVersionPrerelease: [NSNull null], }; } diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index fdea9de2db7eb1..2539c274838368 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -18,9 +18,9 @@ def thirdPartyNdkDir = new File("$buildDir/third-party-ndk") // You need to have following folders in this directory: // - boost_1_63_0 -// - double-conversion-1.1.1 +// - double-conversion-1.1.6 // - folly-deprecate-dynamic-initializer -// - glog-0.3.3 +// - glog-0.3.5 // - jsc-headers def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES") @@ -53,16 +53,16 @@ task prepareBoost(dependsOn: boostPath ? [] : [downloadBoost], type: Copy) { } task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Download) { - src 'https://github.com/google/double-conversion/archive/v1.1.1.tar.gz' + src 'https://github.com/google/double-conversion/archive/v1.1.6.tar.gz' onlyIfNewer true overwrite false - dest new File(downloadsDir, 'double-conversion-1.1.1.tar.gz') + dest new File(downloadsDir, 'double-conversion-1.1.6.tar.gz') } task prepareDoubleConversion(dependsOn: dependenciesPath ? [] : [downloadDoubleConversion], type: Copy) { from dependenciesPath ?: tarTree(downloadDoubleConversion.dest) from 'src/main/jni/third-party/double-conversion/Android.mk' - include 'double-conversion-1.1.1/src/**/*', 'Android.mk' + include 'double-conversion-1.1.6/src/**/*', 'Android.mk' filesMatching('*/src/**/*', {fname -> fname.path = "double-conversion/${fname.name}"}) includeEmptyDirs = false into "$thirdPartyNdkDir/double-conversion" @@ -85,10 +85,10 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy } task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) { - src 'https://github.com/google/glog/archive/v0.3.3.tar.gz' + src 'https://github.com/google/glog/archive/v0.3.5.tar.gz' onlyIfNewer true overwrite false - dest new File(downloadsDir, 'glog-0.3.3.tar.gz') + dest new File(downloadsDir, 'glog-0.3.5.tar.gz') } // Prepare glog sources to be compiled, this task will perform steps that normally should've been @@ -96,7 +96,7 @@ task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) { task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy) { from dependenciesPath ?: tarTree(downloadGlog.dest) from 'src/main/jni/third-party/glog/' - include 'glog-0.3.3/src/**/*', 'Android.mk', 'config.h' + include 'glog-0.3.5/src/**/*', 'Android.mk', 'config.h' includeEmptyDirs = false filesMatching('**/*.h.in') { filter(ReplaceTokens, tokens: [ @@ -122,9 +122,9 @@ task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy) } task downloadJSCHeaders(type: Download) { - // in sync with webkit SVN revision 174650 - def jscAPIBaseURL = 'https://raw.githubusercontent.com/WebKit/webkit/38b15a3ba3c1b0798f2036f7cea36ffdc096202e/Source/JavaScriptCore/API/' - def jscHeaderFiles = ['JavaScript.h', 'JSBase.h', 'JSContextRef.h', 'JSObjectRef.h', 'JSRetainPtr.h', 'JSStringRef.h', 'JSValueRef.h', 'WebKitAvailability.h'] + // in sync with webkit SVN revision 224110 + def jscAPIBaseURL = 'https://raw.githubusercontent.com/WebKit/webkit/7d54617067ba6f2333f1b0b46dc39eea9e32a529/Source/JavaScriptCore/API/' + def jscHeaderFiles = ['JavaScript.h', 'JSTypedArray.h','JSBase.h', 'JSContextRef.h', 'JSObjectRef.h', 'JSRetainPtr.h', 'JSStringRef.h', 'JSValueRef.h', 'WebKitAvailability.h'] def output = new File(downloadsDir, 'jsc') output.mkdirs() src(jscHeaderFiles.collect { headerName -> "$jscAPIBaseURL$headerName" }) @@ -133,10 +133,15 @@ task downloadJSCHeaders(type: Download) { dest output } +task downloadJSC(type: Exec) { + workingDir "../jsc-android-manager" + commandLine('yarn', 'install') +} + // Create Android.mk library module based on so files from mvn + include headers fetched from webkit.org -task prepareJSC(dependsOn: dependenciesPath ? [] : [downloadJSCHeaders]) << { +task prepareJSC(dependsOn: dependenciesPath ? [] : [downloadJSCHeaders, downloadJSC]) doLast { copy { - from zipTree(configurations.compile.fileCollection { dep -> dep.name == 'android-jsc' }.singleFile) + from zipTree("../jsc-android-manager/node_modules/jsc-android/dist/org/webkit/android-jsc/r224109/android-jsc-r224109.aar") from dependenciesPath ? "$dependenciesPath/jsc-headers" : {downloadJSCHeaders.dest} from 'src/main/jni/third-party/jsc/Android.mk' include 'jni/**/*.so', '*.h', 'Android.mk' @@ -221,7 +226,11 @@ task cleanReactNdkLib(type: Exec) { task packageReactNdkLibs(dependsOn: buildReactNdkLib, type: Copy) { from "$buildDir/react-ndk/all" - exclude '**/libjsc.so' + + // include jsc dependencies + from "$thirdPartyNdkDir/jsc/jni" + include '**/*.so' + into "$buildDir/react-ndk/exported" } @@ -273,6 +282,7 @@ android { packagingOptions { exclude 'META-INF/NOTICE' exclude 'META-INF/LICENSE' + exclude 'lib/**/libc++_shared.so' } } @@ -283,12 +293,11 @@ dependencies { compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' compile 'com.facebook.fresco:fresco:1.3.0' compile 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0' - compile 'com.facebook.soloader:soloader:0.1.0' + compile 'com.facebook.soloader:soloader:0.3.0' compile 'com.google.code.findbugs:jsr305:3.0.0' compile 'com.squareup.okhttp3:okhttp:3.6.0' compile 'com.squareup.okhttp3:okhttp-urlconnection:3.6.0' compile 'com.squareup.okio:okio:1.13.0' - compile 'org.webkit:android-jsc:r174650' testCompile "junit:junit:${JUNIT_VERSION}" testCompile "org.powermock:powermock-api-mockito:${POWERMOCK_VERSION}" diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index aff1e36757f5c2..a29515345d8615 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,11 +1,10 @@ -VERSION_NAME=0.55.4 +VERSION_NAME=0.55.5 GROUP=com.facebook.react POM_NAME=ReactNative POM_ARTIFACT_ID=react-native POM_PACKAGING=aar -android.useDeprecatedNdk=true MOCKITO_CORE_VERSION=1.10.19 POWERMOCK_VERSION=1.6.2 diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index 57ee1c8cc62ec2..9545056177f6f6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java @@ -17,6 +17,6 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, "minor", 55, - "patch", 4, + "patch", 5, "prerelease", null); } diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk index 2a1e94dc049479..12f487b7926835 100644 --- a/ReactAndroid/src/main/jni/Application.mk +++ b/ReactAndroid/src/main/jni/Application.mk @@ -1,15 +1,15 @@ APP_BUILD_SCRIPT := Android.mk -APP_ABI := armeabi-v7a x86 -APP_PLATFORM := android-9 +APP_ABI := armeabi-v7a x86 arm64-v8a x86_64 +APP_PLATFORM := android-16 APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party -APP_STL := gnustl_shared +APP_STL := c++_shared # Make sure every shared lib includes a .note.gnu.build-id header APP_LDFLAGS := -Wl,--build-id -NDK_TOOLCHAIN_VERSION := 4.8 +NDK_TOOLCHAIN_VERSION := clang diff --git a/ReactAndroid/src/main/jni/first-party/fb/Android.mk b/ReactAndroid/src/main/jni/first-party/fb/Android.mk index aaf198bce73ff1..3062b1c094a155 100644 --- a/ReactAndroid/src/main/jni/first-party/fb/Android.mk +++ b/ReactAndroid/src/main/jni/first-party/fb/Android.mk @@ -31,7 +31,7 @@ ifeq ($(TOOLCHAIN_PERMISSIVE),true) endif LOCAL_CFLAGS += -DHAVE_POSIX_CLOCKS -CXX11_FLAGS := -std=gnu++11 +CXX11_FLAGS := -std=c++11 LOCAL_CFLAGS += $(CXX11_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk b/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk index 6d08079a7ebc7b..be13e47a6f4891 100644 --- a/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk +++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk @@ -10,7 +10,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS := -fexceptions -fno-omit-frame-pointer LOCAL_CFLAGS += -Wall -Werror -CXX11_FLAGS := -std=gnu++11 +CXX11_FLAGS := -std=c++11 LOCAL_CFLAGS += $(CXX11_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk index 8d8b992d52432e..cef958c258e781 100644 --- a/ReactAndroid/src/main/jni/react/jni/Android.mk +++ b/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -30,13 +30,21 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../.. -LOCAL_CFLAGS += -Wall -Werror -fvisibility=hidden -fexceptions -frtti +LOCAL_CFLAGS += \ + -Werror \ + -fvisibility=hidden \ + -fexceptions \ + -frtti \ + -Wno-pessimizing-move \ + -Wno-inconsistent-missing-override \ + -Wno-unused-lambda-capture + CXX11_FLAGS := -std=c++11 LOCAL_CFLAGS += $(CXX11_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) LOCAL_LDLIBS += -landroid -LOCAL_SHARED_LIBRARIES := libfolly_json libfbjni libjsc libglog_init libyoga libprivatedata +LOCAL_SHARED_LIBRARIES := libfolly_json libfb libjsc libglog_init libyoga libprivatedata LOCAL_STATIC_LIBRARIES := libreactnative include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/ReactAndroid/src/main/jni/third-party/boost/Android.mk index 35de5ae29b06d1..a2fae50aded801 100644 --- a/ReactAndroid/src/main/jni/third-party/boost/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/boost/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0 -CXX11_FLAGS := -std=gnu++11 +CXX11_FLAGS := -std=c++1y LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) LOCAL_MODULE := boost diff --git a/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk b/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk index bf0fa7face0153..97b908d91cb6de 100644 --- a/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/double-conversion/Android.mk @@ -16,8 +16,8 @@ LOCAL_SRC_FILES := \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -CXX11_FLAGS := -std=c++11 -Wno-unused-variable -Wno-unused-local-typedefs +CXX11_FLAGS := -std=c++1y -Wno-unused-variable -Wno-unused-local-typedefs LOCAL_CFLAGS += $(CXX11_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk index 5692613c8dd1fe..b25689672454fa 100644 --- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk @@ -14,12 +14,12 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -LOCAL_CFLAGS += -Wall -Werror -std=c++11 +LOCAL_CFLAGS += -Wall -Werror -CXX11_FLAGS := -std=gnu++11 +CXX11_FLAGS := -std=c++1y LOCAL_CFLAGS += $(CXX11_FLAGS) -FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 +FOLLY_FLAGS := -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_MEMRCHR=1 LOCAL_CFLAGS += $(FOLLY_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) $(FOLLY_FLAGS) diff --git a/ReactAndroid/src/main/jni/third-party/glog/Android.mk b/ReactAndroid/src/main/jni/third-party/glog/Android.mk index 96478acbe922a5..3fb2bd31cd3a16 100644 --- a/ReactAndroid/src/main/jni/third-party/glog/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/glog/Android.mk @@ -3,17 +3,17 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - glog-0.3.3/src/demangle.cc \ - glog-0.3.3/src/logging.cc \ - glog-0.3.3/src/raw_logging.cc \ - glog-0.3.3/src/signalhandler.cc \ - glog-0.3.3/src/symbolize.cc \ - glog-0.3.3/src/utilities.cc \ - glog-0.3.3/src/vlog_is_on.cc + glog-0.3.5/src/demangle.cc \ + glog-0.3.5/src/logging.cc \ + glog-0.3.5/src/raw_logging.cc \ + glog-0.3.5/src/signalhandler.cc \ + glog-0.3.5/src/symbolize.cc \ + glog-0.3.5/src/utilities.cc \ + glog-0.3.5/src/vlog_is_on.cc -LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.3/src/ +LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/ -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.3/src/ +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/ LOCAL_CFLAGS += \ -Wall \ @@ -24,9 +24,10 @@ LOCAL_CFLAGS += \ -g \ -O2 \ -D_START_GOOGLE_NAMESPACE_="namespace google {" \ - -D_END_GOOGLE_NAMESPACE_="}" + -D_END_GOOGLE_NAMESPACE_="}" \ + -DHAVE_PREAD=1 LOCAL_MODULE := glog -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file +include $(BUILD_SHARED_LIBRARY) diff --git a/ReactAndroid/src/main/jni/third-party/glog/config.h b/ReactAndroid/src/main/jni/third-party/glog/config.h index 1e20b0da7a570f..e87b06ca31b681 100644 --- a/ReactAndroid/src/main/jni/third-party/glog/config.h +++ b/ReactAndroid/src/main/jni/third-party/glog/config.h @@ -132,7 +132,7 @@ #define PACKAGE_NAME "glog" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glog 0.3.3" +#define PACKAGE_STRING "glog 0.3.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "glog" @@ -141,7 +141,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.3.3" +#define PACKAGE_VERSION "0.3.5" /* How to access the PC from a struct ucontext */ /* #undef PC_FROM_UCONTEXT */ @@ -163,7 +163,7 @@ #define TEST_SRC_DIR "." /* Version number of package */ -#define VERSION "0.3.3" +#define VERSION "0.3.5" /* Stops putting the code inside the Google namespace */ #define _END_GOOGLE_NAMESPACE_ } diff --git a/ReactAndroid/src/main/jni/third-party/jsc/Android.mk b/ReactAndroid/src/main/jni/third-party/jsc/Android.mk index 25462a614df5d3..60d3aa531d0b0f 100644 --- a/ReactAndroid/src/main/jni/third-party/jsc/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/jsc/Android.mk @@ -3,4 +3,4 @@ include $(CLEAR_VARS) LOCAL_MODULE:= jsc LOCAL_SRC_FILES := jni/$(TARGET_ARCH_ABI)/libjsc.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -include $(PREBUILT_SHARED_LIBRARY) \ No newline at end of file +include $(PREBUILT_SHARED_LIBRARY) diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk index 56ffdb1b3c5298..5007100287b99d 100644 --- a/ReactCommon/cxxreact/Android.mk +++ b/ReactCommon/cxxreact/Android.mk @@ -30,8 +30,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) LOCAL_CFLAGS := \ -DLOG_TAG=\"ReactNative\" -LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti -CXX11_FLAGS := -std=c++11 +LOCAL_CFLAGS += -Wall -Werror -Wno-unused-lambda-capture -fexceptions -frtti +CXX11_FLAGS := -std=c++14 LOCAL_CFLAGS += $(CXX11_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) diff --git a/ReactCommon/jschelpers/Android.mk b/ReactCommon/jschelpers/Android.mk index 9202278639254f..a3152b131be8e3 100644 --- a/ReactCommon/jschelpers/Android.mk +++ b/ReactCommon/jschelpers/Android.mk @@ -16,7 +16,7 @@ LOCAL_CFLAGS := \ -DLOG_TAG=\"ReactNative\" LOCAL_CFLAGS += -Wall -Werror -fexceptions -frtti -CXX11_FLAGS := -std=c++11 +CXX11_FLAGS := -std=c++1y LOCAL_CFLAGS += $(CXX11_FLAGS) LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS) diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar new file mode 100644 index 00000000000000..e78590462fd165 Binary files /dev/null and b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar differ diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar.md5 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar.md5 new file mode 100644 index 00000000000000..ef086b750cf63e --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar.md5 @@ -0,0 +1 @@ +68d4dc68c08d82c1bfc6a08d5234e4d7 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar.sha1 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar.sha1 new file mode 100644 index 00000000000000..5a8ede8a991f7d --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-javadoc.jar.sha1 @@ -0,0 +1 @@ +14636bff254d0837dbfedfa385feea035d1d681d \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar new file mode 100644 index 00000000000000..d4d35d5bc312d2 Binary files /dev/null and b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar differ diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar.md5 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar.md5 new file mode 100644 index 00000000000000..923c895e78b772 --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar.md5 @@ -0,0 +1 @@ +49f96c1aed66033b129139ec6fc246dc \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar.sha1 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar.sha1 new file mode 100644 index 00000000000000..9ceabecec9204a --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5-sources.jar.sha1 @@ -0,0 +1 @@ +42636c86e2af99fba393dc1bb2c8a0f6a4f69d9b \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar new file mode 100644 index 00000000000000..6904790989ffa0 Binary files /dev/null and b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar differ diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar.md5 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar.md5 new file mode 100644 index 00000000000000..5cafc3fd925bae --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar.md5 @@ -0,0 +1 @@ +42a18f98820bea6f97189d904bab613c \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar.sha1 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar.sha1 new file mode 100644 index 00000000000000..63ced098a113fb --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.aar.sha1 @@ -0,0 +1 @@ +dd741fe1c57087fd0e0ebc7010551c986304ae72 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom new file mode 100644 index 00000000000000..4239c929ed3cb7 --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom @@ -0,0 +1,92 @@ + + + 4.0.0 + com.facebook.react + react-native + 0.55.5 + aar + ReactNative + A framework for building native apps with React + https://github.com/facebook/react-native + + + MIT License + https://github.com/facebook/react-native/blob/master/LICENSE + repo + + + + + facebook + Facebook + + + + scm:git:https://github.com/facebook/react-native.git + scm:git:git@github.com:facebook/react-native.git + https://github.com/facebook/react-native.git + + + + javax.inject + javax.inject + 1 + compile + + + com.android.support + appcompat-v7 + 23.0.1 + compile + + + com.facebook.fbui.textlayoutbuilder + textlayoutbuilder + 1.0.0 + compile + + + com.facebook.fresco + fresco + 1.3.0 + compile + + + com.facebook.fresco + imagepipeline-okhttp3 + 1.3.0 + compile + + + com.facebook.soloader + soloader + 0.3.0 + compile + + + com.google.code.findbugs + jsr305 + 3.0.0 + compile + + + com.squareup.okhttp3 + okhttp + 3.6.0 + compile + + + com.squareup.okhttp3 + okhttp-urlconnection + 3.6.0 + compile + + + com.squareup.okio + okio + 1.13.0 + compile + + + diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom.md5 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom.md5 new file mode 100644 index 00000000000000..6b3d86a8903161 --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom.md5 @@ -0,0 +1 @@ +8aabce994efc19a604dd4ec965dc3c3c \ No newline at end of file diff --git a/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom.sha1 b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom.sha1 new file mode 100644 index 00000000000000..1a8440dc0ce3a2 --- /dev/null +++ b/android/com/facebook/react/react-native/0.55.5/react-native-0.55.5.pom.sha1 @@ -0,0 +1 @@ +1cd1a0f6bc48f461c550139b83b02419c423b9d4 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/maven-metadata.xml b/android/com/facebook/react/react-native/maven-metadata.xml new file mode 100644 index 00000000000000..9dcd6a380156be --- /dev/null +++ b/android/com/facebook/react/react-native/maven-metadata.xml @@ -0,0 +1,12 @@ + + + com.facebook.react + react-native + + 0.55.5 + + 0.55.5 + + 20180614201021 + + diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.md5 b/android/com/facebook/react/react-native/maven-metadata.xml.md5 new file mode 100644 index 00000000000000..a4207e37b7ae7a --- /dev/null +++ b/android/com/facebook/react/react-native/maven-metadata.xml.md5 @@ -0,0 +1 @@ +12a642eade9d9070fd9d5de5be821f91 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha1 b/android/com/facebook/react/react-native/maven-metadata.xml.sha1 new file mode 100644 index 00000000000000..5db0fd9ab95ad8 --- /dev/null +++ b/android/com/facebook/react/react-native/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +bbd6a8df7e735d3716acfc07a43b9ccd19dcd9b2 \ No newline at end of file diff --git a/jsc-android-manager/package.json b/jsc-android-manager/package.json new file mode 100644 index 00000000000000..6d597ca51f8425 --- /dev/null +++ b/jsc-android-manager/package.json @@ -0,0 +1,8 @@ +{ + "name": "jsc-android-manager", + "version": "0.0.1", + "private": true, + "dependencies": { + "jsc-android": "224109.0.0" + } +} diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/local-cli/templates/HelloWorld/android/app/build.gradle index ec6f3022572ae6..b9fe74face9799 100644 --- a/local-cli/templates/HelloWorld/android/app/build.gradle +++ b/local-cli/templates/HelloWorld/android/app/build.gradle @@ -103,16 +103,13 @@ android { targetSdkVersion 22 versionCode 1 versionName "1.0" - ndk { - abiFilters "armeabi-v7a", "x86" - } } splits { abi { reset() enable enableSeparateBuildPerCPUArchitecture universalApk false // If true, also generate a universal APK - include "armeabi-v7a", "x86" + include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } } buildTypes { @@ -126,7 +123,7 @@ android { variant.outputs.each { output -> // For each separate APK per architecture, set a unique version code as described here: // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits - def versionCodes = ["armeabi-v7a":1, "x86":2] + def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a":3, "x86_64":4] def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = diff --git a/local-cli/templates/HelloWorld/android/gradle.properties b/local-cli/templates/HelloWorld/android/gradle.properties index 1fd964e90b1c5e..89e0d99e2173fc 100644 --- a/local-cli/templates/HelloWorld/android/gradle.properties +++ b/local-cli/templates/HelloWorld/android/gradle.properties @@ -16,5 +16,3 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true - -android.useDeprecatedNdk=true diff --git a/package.json b/package.json index bd1562054a5852..f365a85bdccdd8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native", - "version": "0.55.4", + "version": "0.55.5", "description": "A framework for building native apps using React", "license": "MIT", "repository": { @@ -224,4 +224,4 @@ "shelljs": "^0.7.8", "sinon": "^2.2.0" } -} \ No newline at end of file +} diff --git a/react.gradle b/react.gradle index 64b2f02f8cbf26..cac459dbe7dcfd 100644 --- a/react.gradle +++ b/react.gradle @@ -109,6 +109,8 @@ gradle.projectsEvaluated { runBefore("process${flavorNameCapitalized}Armeabi-v7a${buildNameCapitalized}Resources", currentBundleTask) runBefore("process${flavorNameCapitalized}X86${buildNameCapitalized}Resources", currentBundleTask) + runBefore("process${flavorNameCapitalized}Arm64-v8a${buildNameCapitalized}Resources", currentBundleTask) + runBefore("process${flavorNameCapitalized}X86_64${buildNameCapitalized}Resources", currentBundleTask) runBefore("processUniversal${targetName}Resources", currentBundleTask) runBefore("process${targetName}Resources", currentBundleTask) runBefore("dataBindingProcessLayouts${targetName}", currentBundleTask)