status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-13 11:05:21 +00:00
Code Issues Projects Releases Wiki Activity

Circle CI releases now work with Java 8

Browse Source 
Reviewed By: bestander

Differential Revision: D4095313

fbshipit-source-id: 1806db054bbca86f6394af077baeccac4e7efbe1
This commit is contained in:
Ovidiu Viorel Iepure 2016-10-28 07:55:33 -07:00 committed by Facebook Github Bot
parent 103257b793
commit 4cff039d78
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ReactAndroid/release.gradle
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 -> afterEvaluate { project ->
task androidJavadoc(type: Javadoc) { task androidJavadoc(type: Javadoc) {
@ -84,8 +92,7 @@ afterEvaluate { project ->
artifacts { artifacts {
archives androidSourcesJar archives androidSourcesJar
// TODO Make Javadoc generation work with Java 1.8, currently only works with 1.7 archives androidJavadocJar
// archives androidJavadocJar
} }
version = VERSION_NAME version = VERSION_NAME

14
scripts/publish-npm.js
View File

@ -50,7 +50,6 @@
require(`shelljs/global`); require(`shelljs/global`);
const buildBranch = process.env.CIRCLE_BRANCH; const buildBranch = process.env.CIRCLE_BRANCH;
const requiredJavaVersion = `1.7`;
let branchVersion; let branchVersion;
if (buildBranch.indexOf(`-stable`) !== -1) { if (buildBranch.indexOf(`-stable`) !== -1) {
@ -88,19 +87,6 @@ if (tagsWithVersion[0].indexOf(`-rc`) === -1) {
} }
// -------- Generating Android Artifacts with JavaDoc // -------- Generating Android Artifacts with JavaDoc
// Java -version outputs to stderr 0_o
const javaVersion = exec(`java -version`).stderr;
if (javaVersion.indexOf(requiredJavaVersion) === -1) {
echo(`Java version must be 1.7.x in order to generate Javadoc. Check: java -version`);
exit(1);
}
// Uncomment Javadoc generation
if (sed(`-i`, `// archives androidJavadocJar`, `archives androidJavadocJar`, `ReactAndroid/release.gradle`).code) {
echo(`Couldn't enable Javadoc generation`);
exit(1);
}
if (exec(`./gradlew :ReactAndroid:installArchives`).code) { if (exec(`./gradlew :ReactAndroid:installArchives`).code) {
echo(`Couldn't generate artifacts`); echo(`Couldn't generate artifacts`);
exit(1); exit(1);