Build improvements.

Updated to latest Gradle, aligned closer to previous SBT build and rationalised all configuration.

Author: ldaley

.travis.yml

@@ -1,3 +1,11 @@
 language: java
-script: sbt test
-
+script:
+- ./gradlew check
+cache:
+  directories:
+  - $HOME/.gradle
+jdk:
+- openjdk6
+env:
+  global:
+  - TERM=dumb

CopyrightWaivers.txt

@@ -26,3 +26,4 @@ savulchik      | Stanislav Savulchik, [email protected]
 ktoso          | Konrad Malawski, [email protected], Typesafe Inc.
 ouertani       | Slim Ouertani, [email protected]
 2m             | Martynas Mickevičius, [email protected], Typesafe Inc.
+ldaley         | Luke Daley, [email protected], Gradleware Inc.

api/build.gradle

@@ -1 +1 @@
-description = 'reactive-streams-api'
+description = "reactive-streams"

build.gradle

@@ -1,104 +1,105 @@
-allprojects {
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'eclipse'
-    apply plugin: 'idea'
-    apply plugin: 'ivy-publish'
-    
+subprojects {
+    apply plugin: "java"
+    apply plugin: "osgi"
 
-    group = 'org.reactivestreams'
-    version = '1.0.0.M1'
+    group = "org.reactivestreams"
+    version = "1.0.0.M1"
 
-	 
-    gradle.projectsEvaluated {
-        tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
-            options.encoding = 'UTF-8'           
-        }
-        
-        tasks.withType(Javadoc) {
-            source = sourceSets.main.allJava          
-           
-            configure(options) {  
-                encoding 'UTF-8'
-                docEncoding 'UTF-8'
-                charSet 'UTF-8'
-                linkSource true 
-                noTimestamp true               
-            }
+    sourceCompatibility = 1.6
+    targetCompatibility = 1.6
+
+    tasks.withType(JavaCompile) {
+        configure(options) {
+            compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+            encoding = "UTF-8"
         }
     }
 
-    uploadArchives {
-      
-        repositories {
-         
-            mavenDeployer {
+    tasks.withType(Javadoc) {
+        configure(options) {
+            encoding "UTF-8"
+            docEncoding "UTF-8"
+            charSet "UTF-8"
+            linkSource true
+            noTimestamp true
+        }
+    }
 
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2")
+    repositories {
+        mavenCentral()
+    }
 
-                pom.project {
-                    name 'org.reactivestreams'
-                    packaging 'jar'
-                    url 'http://www.reactive-streams.org/'
-                    inceptionYear '2014'
+    jar {
+        manifest {
+            instruction "Bundle-Vendor", "Reactive Streams SIG"
+            instruction "Bundle-Description", "Reactive Streams API"
+            instruction "Bundle-DocURL", "http://reactive-streams.org"
+        }
+    }
 
-                    scm {
-                        url '[email protected]:reactive-streams/reactive-streams.git'
-                        connection 'scm:git:[email protected]:reactive-streams/reactive-streams.git'
-                    }
+    if (name in ["reactive-streams", "reactive-streams-tck"]) {
+        apply plugin: "maven"
+        apply plugin: "signing"
 
-                    licenses {
-                        license {
-                            name 'CC0'
-                            url 'http://creativecommons.org/publicdomain/zero/1.0/'
-                            distribution 'repo'
-                        }
-                    }
+        signing {
+            sign configurations.archives
+            required { gradle.taskGraph.hasTask(uploadArchives) }
+        }
+        task sourcesJar(type: Jar) {
+            classifier "sources"
+            from sourceSets.main.allSource
+        }
 
-                    developers {
-                        developer {
-                            id 'reactive-streams-sig'
-                            name 'Reactive Streams SIG'
-                            url 'http://www.reactive-streams.org/'
-                        }
-                    }
-                }
-            }
-         
+        task javadocJar(type: Jar) {
+            classifier "javadoc"
+            from javadoc
         }
-    }
-    repositories {
-        mavenLocal()
-        mavenCentral()
-    }
-    
-    publishing {
-        repositories {
-            ivy {
-                // change to point to your repo, e.g. http://my.org/repo
-                url "${rootProject.buildDir}/repo"
-            }
+
+        artifacts {
+            archives sourcesJar, javadocJar
         }
-        publications {
-            ivy(IvyPublication) {
-                from components.java
-                descriptor.withXml {
-                    asNode().info[0].appendNode('description', description)
+
+        uploadArchives {
+            repositories {
+                mavenDeployer {
+                    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2")
                 }
             }
         }
-    }
-}
 
-subprojects {
+        tasks.withType(Upload) {
+            repositories.withType(MavenResolver) {
+                it.beforeDeployment { signing.signPom(it) }
+                it.pom.whenConfigured { pom ->
+                    pom.project {
+                        url "http://www.reactive-streams.org/"
+                        inceptionYear "2014"
 
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
+                        scm {
+                            url "[email protected]:reactive-streams/reactive-streams.git"
+                            connection "scm:git:[email protected]:reactive-streams/reactive-streams.git"
+                        }
 
-    compileJava.options.encoding = 'UTF-8'
+                        licenses {
+                            license {
+                                name "CC0"
+                                url "http://creativecommons.org/publicdomain/zero/1.0/"
+                                distribution "repo"
+                            }
+                        }
 
-    javadoc {        
-        options.encoding = 'UTF-8'
-    }    
-}
+                        developers {
+                            developer {
+                                id "reactive-streams-sig"
+                                name "Reactive Streams SIG"
+                                url "http://www.reactive-streams.org/"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } else {
+        uploadArchives.enabled = false
+    }
+}

examples/build.gradle

@@ -1,4 +1,4 @@
 description = 'reactive-streams-examples'
 dependencies {
-    compile project(':reactive-streams-api')
+    compile project(':reactive-streams')
 }

examples/build.sbt

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,9 @@
 rootProject.name = 'reactive-streams'
-include ':reactive-streams-api'
+include ':reactive-streams'
 include ':reactive-streams-tck'
 include ':reactive-streams-examples'
 
-project(':reactive-streams-api').projectDir = "$rootDir/api" as File
+project(':reactive-streams').projectDir = "$rootDir/api" as File
 project(':reactive-streams-tck').projectDir = "$rootDir/tck" as File
 project(':reactive-streams-examples').projectDir = "$rootDir/examples" as File
 

settings.gradle

@@ -1,6 +1,6 @@
 description = 'reactive-streams-tck'
 dependencies {
     compile group: 'org.testng', name: 'testng', version:'5.14.10'
-    compile project(':reactive-streams-api')
+    compile project(':reactive-streams')
 }
 test.useTestNG()