Merge pull request #89 from ReactiveSocket/stevegury/project-aggregation

Aggregation of reactivesocket-java-impl into reactivesocket-java

Author: robertroeser

.travis.yml

@@ -19,7 +19,7 @@ cache:
   directories:
   - $HOME/.m2
   - $HOME/.gradle
-  
+
 env:
   global:
   - secure: cXHzd2WHqmdmJEyEKlELt8Rp9qCvhTRXTEHpQz0sKt55KorI8vO33sSOBs8uBqknWgGgOzHsB7cw0dJRxCmW+BRy90ELtdg/dVLzU8D8BrI6/DHzd/Bhyt9wx2eVdLmDV7lQ113AqJ7lphbH+U8ceTBlbNYDPKcIjFhsPO0WcPxQYed45na8XRK0UcAOpVmmNlTE6fHy5acQblNO84SN6uevCFqWAZJY7rc6xGrzFzca+ul5kR8xIzdE5jKs2Iw0MDeWi8cshkhj9c0FDtfsNIB1F+NafDtEdqjt6kMqYAUUiTAM2QdNoffzgmWEbVOj3uvthlm+S11XaU3Cn2uC7CiZTn2ebuoqCuV5Ge6KQI0ysEQVUfLhIF7iJG6dJvoyYy8ta8LEcjcsYAdF34BVddoUJkp+eJuhlto2aTZsDdXpmnwRM1PPDRoyrLjRcKiWYPR2tO2RG9sb0nRAGEpHTDd5ju2Ta4zpvgpWGUiKprs5R+YY7TEg16VSTYMmCJj5C9ap2lYIH4EoxsQpuxYig9AV1sOUJujLSa4TXqlcOmSM0IkHJ/i0VE8TZg4nV4XowyH6nKZ63InF4pUDcG13BpJQyTFKbK2D0lFn8MzpWvIV2oOUxNkOaOBg9cGhAnv9Sfw/Iv1UVaUgCNQd2M0R0rwfJoPCg2mmWVxsvh3cW4M=

README.md

@@ -1,27 +1,43 @@
 buildscript {
-  repositories {
-      jcenter()
-   }
-
-  dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.5' }
+    repositories { jcenter() }
+    dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.6' }
 }
 
 description = 'ReactiveSocket: stream oriented messaging passing with Reactive Stream semantics.'
 
 apply plugin: 'reactivesocket-project'
-apply plugin: 'java'
-
-repositories {
-    maven { url 'https://oss.jfrog.org/libs-snapshot' }
-}
-
-dependencies {
-	compile 'org.reactivestreams:reactive-streams:1.0.0.final'
-	compile 'org.agrona:Agrona:0.4.13'
 
-	testCompile 'io.reactivex:rxjava:2.0.0-DP0-20151003.214425-143'
-	testCompile 'junit:junit:4.12'
-	testCompile 'org.mockito:mockito-core:1.10.19'
+subprojects {
+    apply plugin: 'reactivesocket-project'
+    apply plugin: 'java'
+
+    compileJava {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    repositories {
+        jcenter()
+        maven { url 'https://oss.jfrog.org/libs-snapshot' }
+        maven { url 'https://dl.bintray.com/reactivesocket/ReactiveSocket' }
+    }
+
+    dependencies {
+        compile 'org.reactivestreams:reactive-streams:1.0.0.final'
+        compile 'org.agrona:Agrona:0.4.13'
+        compile 'io.reactivex:rxjava:latest.release'
+        compile 'io.reactivex:rxjava-reactive-streams:latest.release'
+        compile 'org.hdrhistogram:HdrHistogram:latest.release'
+        compile 'org.slf4j:slf4j-api:latest.release'
+
+        testCompile 'junit:junit:4.12'
+        testCompile 'org.mockito:mockito-core:1.10.19'
+        testRuntime 'org.slf4j:slf4j-simple:1.7.12'
+    }
+
+    test {
+        testLogging.showStandardStreams = true
+    }
 }
 
 // support for snapshot/final releases via versioned branch names like 1.x
@@ -33,12 +49,3 @@ nebulaRelease {
 if (project.hasProperty('release.useLastTag')) {
     tasks.prepare.enabled = false
 }
-
-test {
-    testLogging.showStandardStreams = true
-}
-
-compileJava {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
-}

build.gradle

@@ -1,6 +1,6 @@
-#Mon Mar 07 16:10:12 PST 2016
+#Tue Mar 15 03:05:19 MSK 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,3 @@
+dependencies {
+    testCompile 'io.reactivex:rxjava:2.0.0-DP0-20151003.214425-143'
+}