Merge remote-tracking branch 'build/multi-project'

Conflicts: .gitignore build.gradle gradle.properties gradle/buildscript.gradle gradle/convention.gradle settings.gradle
simonhoo · Dec 14, 2012 · da57e54 · da57e54
2 parents 9dec369 + 36e5b8f
commit da57e54
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle
@@ -1,8 +1,9 @@
 // Executed in context of buildscript
 repositories {
+    // Repo in addition to maven central
     maven {
         name 'build-repo'
-        url 'https://github.com/Netflix-Skunkworks/build-repo/raw/master/releases/'
+        url 'https://raw.github.com/Netflix-Skunkworks/build-repo/master/releases/' // gradle-release/gradle-release/1.0-SNAPSHOT/gradle-release-1.0-SNAPSHOT.jar
     }
 }
 dependencies {

diff --git a/gradle/convention.gradle b/gradle/convention.gradle
@@ -54,6 +54,20 @@ subprojects { project ->
     // Ensure output is on a new line
     javadoc.doFirst { println "" }
 
+    configurations {
+        provided {
+            description = 'much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive.'
+            transitive = false
+            visible = false
+        }
+    }
+
+    project.sourceSets {
+        main.compileClasspath += project.configurations.provided
+        main.runtimeClasspath -= project.configurations.provided
+        test.compileClasspath += project.configurations.provided
+        test.runtimeClasspath += project.configurations.provided
+    }
 }
 
 task aggregateJavadoc(type: Javadoc) {