diff --git a/.gitignore b/.gitignore index 4fb4a25d15f722..ebf035cb51f264 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,6 @@ buck-out .gradle local.properties *.iml -/android/ # Node node_modules diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 36ed9fec52cb0f..cc7e9c09f5e17c 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -145,32 +145,6 @@ 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', 'JSStringRef.h', 'JSValueRef.h', 'WebKitAvailability.h'] - def output = new File(downloadsDir, 'jsc') - output.mkdirs() - src(jscHeaderFiles.collect { headerName -> "$jscAPIBaseURL$headerName" }) - onlyIfNewer true - overwrite false - dest output -} - -// Create Android.mk library module based on so files from mvn + include headers fetched from webkit.org -task prepareJSC(dependsOn: dependenciesPath ? [] : [downloadJSCHeaders]) { - doLast { - copy { - from zipTree(configurations.compile.fileCollection { dep -> dep.name == 'android-jsc' }.singleFile) - from dependenciesPath ? "$dependenciesPath/jsc-headers" : {downloadJSCHeaders.dest} - from 'src/main/jni/third-party/jsc' - include 'jni/**/*.so', '*.h', 'Android.mk' - filesMatching('*.h', { fname -> fname.path = "JavaScriptCore/${fname.path}"}) - into "$thirdPartyNdkDir/jsc"; - } - } -} - task downloadNdkBuildDependencies { if (!boostPath) { dependsOn downloadBoost @@ -178,7 +152,6 @@ task downloadNdkBuildDependencies { dependsOn downloadDoubleConversion dependsOn downloadFolly dependsOn downloadGlog - dependsOn downloadJSCHeaders } def getNdkBuildName() { @@ -232,8 +205,8 @@ def getNdkBuildFullPath() { return ndkBuildFullPath } -task buildReactNdkLib(dependsOn: [prepareJSC, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog], type: Exec) { - inputs.dir('src/main/jni/react') +task buildReactNdkLib(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog], type: Exec) { + inputs.file('src/main/jni/react') outputs.dir("$buildDir/react-ndk/all") commandLine getNdkBuildFullPath(), 'NDK_PROJECT_PATH=null', @@ -291,7 +264,7 @@ android { sourceSets.main { jni.srcDirs = [] - jniLibs.srcDirs = ["$buildDir/react-ndk/exported", 'src/main/jni/third-party/jsc/jni'] + jniLibs.srcDir "$buildDir/react-ndk/exported" res.srcDirs = ['src/main/res/devsupport', 'src/main/res/shell', 'src/main/res/views/modal', 'src/main/res/views/uimanager'] java { srcDirs = ['src/main/java', 'src/main/libraries/soloader/java', 'src/main/jni/first-party/fb/jni/java'] @@ -326,7 +299,6 @@ dependencies { api "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}" api "com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}" api 'com.squareup.okio:okio:1.14.0' - compile 'org.webkit:android-jsc:r174650' testImplementation "junit:junit:${JUNIT_VERSION}" testImplementation "org.powermock:powermock-api-mockito:${POWERMOCK_VERSION}" diff --git a/ReactAndroid/src/main/jniLibs/arm64-v8a/libc++_shared.so b/ReactAndroid/src/main/jniLibs/arm64-v8a/libc++_shared.so new file mode 100644 index 00000000000000..1d2220c904ce7a Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/arm64-v8a/libc++_shared.so differ diff --git a/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so b/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so deleted file mode 100644 index 6a089dfe7f3c4b..00000000000000 Binary files a/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so and /dev/null differ diff --git a/ReactAndroid/src/main/jniLibs/arm64-v8a/libjsc.so b/ReactAndroid/src/main/jniLibs/arm64-v8a/libjsc.so new file mode 100644 index 00000000000000..6de4403aed15fa Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/arm64-v8a/libjsc.so differ diff --git a/ReactAndroid/src/main/jniLibs/armeabi-v7a/libc++_shared.so b/ReactAndroid/src/main/jniLibs/armeabi-v7a/libc++_shared.so new file mode 100644 index 00000000000000..878807d9f77eca Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/armeabi-v7a/libc++_shared.so differ diff --git a/ReactAndroid/src/main/jniLibs/armeabi-v7a/libjsc.so b/ReactAndroid/src/main/jniLibs/armeabi-v7a/libjsc.so new file mode 100644 index 00000000000000..663adc7adb77da Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/armeabi-v7a/libjsc.so differ diff --git a/ReactAndroid/src/main/jniLibs/x86/libc++_shared.so b/ReactAndroid/src/main/jniLibs/x86/libc++_shared.so new file mode 100644 index 00000000000000..33882c322205dc Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/x86/libc++_shared.so differ diff --git a/ReactAndroid/src/main/jniLibs/x86/libjsc.so b/ReactAndroid/src/main/jniLibs/x86/libjsc.so new file mode 100644 index 00000000000000..5cbb317ead1e85 Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/x86/libjsc.so differ diff --git a/ReactAndroid/src/main/jniLibs/x86_64/libc++_shared.so b/ReactAndroid/src/main/jniLibs/x86_64/libc++_shared.so new file mode 100644 index 00000000000000..2834134deb7c3f Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/x86_64/libc++_shared.so differ diff --git a/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so b/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so deleted file mode 100644 index e6e8acf7952bc5..00000000000000 Binary files a/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so and /dev/null differ diff --git a/ReactAndroid/src/main/jniLibs/x86_64/libjsc.so b/ReactAndroid/src/main/jniLibs/x86_64/libjsc.so new file mode 100644 index 00000000000000..2e670bdb0164b1 Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/x86_64/libjsc.so differ diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar new file mode 100644 index 00000000000000..6c50641fc5693d Binary files /dev/null and b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar differ diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar.md5 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar.md5 new file mode 100644 index 00000000000000..2c8d812064b3f1 --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar.md5 @@ -0,0 +1 @@ +3bf7d42a505e3878d9b3fd427053d740 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar.sha1 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar.sha1 new file mode 100644 index 00000000000000..fb86fb565b1f92 --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-javadoc.jar.sha1 @@ -0,0 +1 @@ +949a0e633e25584fcb596cca5aa7973f9315d1de \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar new file mode 100644 index 00000000000000..efe27b6be6f7ba Binary files /dev/null and b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar differ diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar.md5 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar.md5 new file mode 100644 index 00000000000000..416919dda588be --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar.md5 @@ -0,0 +1 @@ +546e241acb2ec42c06e49ee9f58bd14a \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar.sha1 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar.sha1 new file mode 100644 index 00000000000000..53d090e28feae5 --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master-sources.jar.sha1 @@ -0,0 +1 @@ +f49f4d12ec374eb30a84a0d6a672d31fe7e05697 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar new file mode 100644 index 00000000000000..eaf8f796da15f4 Binary files /dev/null and b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar differ diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar.md5 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar.md5 new file mode 100644 index 00000000000000..80588f31bcc3cc --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar.md5 @@ -0,0 +1 @@ +da9602ba065b990a156e7b14702f15b8 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar.sha1 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar.sha1 new file mode 100644 index 00000000000000..dca58e72a9db31 --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.aar.sha1 @@ -0,0 +1 @@ +89fce83b288a7a09e9dba9059f87a07eac1b3ded \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom new file mode 100644 index 00000000000000..8d73c0e35d7710 --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom @@ -0,0 +1,92 @@ + + + 4.0.0 + com.facebook.react + react-native + 1000.0.0-master + 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 + + + + com.facebook.infer.annotation + infer-annotation + 0.11.2 + compile + + + javax.inject + javax.inject + 1 + compile + + + com.android.support + appcompat-v7 + 27.1.1 + compile + + + com.facebook.fresco + fresco + 1.10.0 + compile + + + com.facebook.fresco + imagepipeline-okhttp3 + 1.10.0 + compile + + + com.facebook.soloader + soloader + 0.5.1 + compile + + + com.google.code.findbugs + jsr305 + 3.0.2 + compile + + + com.squareup.okhttp3 + okhttp + 3.11.0 + compile + + + com.squareup.okhttp3 + okhttp-urlconnection + 3.11.0 + compile + + + com.squareup.okio + okio + 1.14.0 + compile + + + diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom.md5 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom.md5 new file mode 100644 index 00000000000000..bc59ac8165238d --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom.md5 @@ -0,0 +1 @@ +71d16f7d3f09de1b71e6e910ec9b7ca7 \ No newline at end of file diff --git a/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom.sha1 b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom.sha1 new file mode 100644 index 00000000000000..1c60e683d1afb8 --- /dev/null +++ b/android/com/facebook/react/react-native/1000.0.0-master/react-native-1000.0.0-master.pom.sha1 @@ -0,0 +1 @@ +47e8a1696161d87980fe01eb764a61f5ed4469f6 \ 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..1349967404f105 --- /dev/null +++ b/android/com/facebook/react/react-native/maven-metadata.xml @@ -0,0 +1,12 @@ + + + com.facebook.react + react-native + + 1000.0.0-master + + 1000.0.0-master + + 20181118095153 + + 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..09f5e5cc648709 --- /dev/null +++ b/android/com/facebook/react/react-native/maven-metadata.xml.md5 @@ -0,0 +1 @@ +325a338a06576678cc608e2079cfbf24 \ 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..ef614cbf7339fd --- /dev/null +++ b/android/com/facebook/react/react-native/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +0aa3165fa9f7ebb48853209e94a7a64d39808a39 \ No newline at end of file diff --git a/package.json b/package.json index 2d33da14eee723..3f55c3d132f8b1 100644 --- a/package.json +++ b/package.json @@ -173,6 +173,7 @@ "inquirer": "^3.0.6", "jest": "24.0.0-alpha.6", "jest-junit": "5.2.0", + "jsc-android": "236355.1.0", "lodash": "^4.17.5", "metro": "0.50.0", "metro-babel-register": "0.50.0", diff --git a/yarn.lock b/yarn.lock index b3a879a4faaeb6..69a4afccef9703 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3938,6 +3938,11 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsc-android@^236355.1.0: + version "236355.1.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-236355.1.0.tgz#aba6330b9ff9c49632abe50bfc3e5def5c08af58" + integrity sha512-6W6KH19eHNjn6jQF9lgV8Www10iBgmUnLwDgmEmI7zQ+/apjz6seCaMQLTD16aXIer6cgGQa7RRavPskydJ2KA== + jsdom@^11.5.1: version "11.12.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"