Merge branch '0.37-stable' of github.com:facebook/react-native into 0.37-stable

This commit is contained in:
Mike Grabowski
2016-11-02 22:51:00 +01:00
2 changed files with 9 additions and 16 deletions
+9 -2
View File
@@ -54,6 +54,14 @@ def configureReactNativePom(def pom) {
}
}
if (JavaVersion.current().isJava8Compatible()) {
allprojects {
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
}
}
}
afterEvaluate { project ->
task androidJavadoc(type: Javadoc) {
@@ -84,8 +92,7 @@ afterEvaluate { project ->
artifacts {
archives androidSourcesJar
// TODO Make Javadoc generation work with Java 1.8, currently only works with 1.7
// archives androidJavadocJar
archives androidJavadocJar
}
version = VERSION_NAME