Merge pull request #43 from ReactiveX/submodules

New project structure based on submodules (added samples module)

Author: mttkay

.gitignore

@@ -1,11 +1,6 @@
 # Compiled source #
 ###################
-*.com
 *.class
-*.dll
-*.exe
-*.o
-*.so
 
 # Packages #
 ############
@@ -15,7 +10,6 @@
 *.dmg
 *.gz
 *.iso
-*.jar
 *.rar
 *.tar
 *.zip
@@ -66,10 +60,6 @@ bin/
 /.nb-gradle/profiles/private/
 .nb-gradle-properties
 
-# Scala build
-*.cache
-/.nb-gradle/private/
-
 # Android
 local.properties
 

.travis.yml

@@ -1,4 +1,10 @@
-language: java
+language: android
 
 jdk:
   - oraclejdk7
+
+android:
+  components:
+    - android-20
+
+script: "./gradlew build"

build.gradle

@@ -5,27 +5,3 @@ buildscript {
     classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
   }
 }
-
-apply plugin: 'rxjava-project'
-apply plugin: 'provided-base'
-
-dependencies {
-    compile 'io.reactivex:rxjava:1.0.+'
-    provided 'com.google.android:android:4.0.1.2'
-    provided 'com.google.android:support-v4:r7'
-
-    // testing
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
-    testCompile('org.robolectric:robolectric:2.3') {
-      exclude group: 'com.android.support'
-    }
-}
-
-test {
-    testLogging {
-        exceptionFormat "full"
-        events "started"
-        displayGranularity 2
-    }
-}

gradle.properties

@@ -1 +1,2 @@
-version=1.0.0-RC1-SNAPSHOT
+rxJavaVersion=1.0.0-rc.9
+version=0.22.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Thu Sep 18 17:51:34 CEST 2014
+#Wed Oct 22 12:19:29 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

library/build.gradle

@@ -0,0 +1,31 @@
+buildscript {
+  repositories { jcenter() }
+  dependencies {
+    classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.+'
+    classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
+  }
+}
+
+apply plugin: 'rxjava-project'
+apply plugin: 'provided-base'
+
+dependencies {
+    compile "io.reactivex:rxjava:$rxJavaVersion"
+    provided 'com.google.android:android:4.0.1.2'
+    provided 'com.google.android:support-v4:r7'
+
+    // testing
+    testCompile 'junit:junit-dep:4.10'
+    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile('org.robolectric:robolectric:2.3') {
+      exclude group: 'com.android.support'
+    }
+}
+
+test {
+    testLogging {
+        exceptionFormat "full"
+        events "started"
+        displayGranularity 2
+    }
+}