Merge branch 'ui-consolidation'

samcrow · samcrow · commit 2b64806d6440 · 2016-02-08T21:59:29.000-08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -69,6 +69,6 @@ configurations.all {
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    destinationDir = file("../javadoc/")
+    destinationDir = file("../app/build/javadoc/")
     failOnError false
 }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@ configurations.all {`
`69`	`69`	`task javadoc(type: Javadoc) {`
`70`	`70`	`source = android.sourceSets.main.java.srcDirs`
`71`	`71`	`classpath += project.files(android.getBootClasspath().join(File.pathSeparator))`
`72`		`- destinationDir = file("../javadoc/")`
	`72`	`+ destinationDir = file("../app/build/javadoc/")`
`73`	`73`	`failOnError false`
`74`	`74`	`}`