merge

Author: MarioAriasC

gradle/buildscript.gradle

@@ -8,4 +8,5 @@ dependencies {
     classpath 'com.mapvine:gradle-cobertura-plugin:0.1'
     classpath 'gradle-release:gradle-release:1.1.5'
     classpath 'org.ajoberstar:gradle-git:0.5.0'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.6.+'
 }

language-adaptors/rxjava-kotlin/README.md

@@ -0,0 +1,19 @@
+apply plugin: 'kotlin'
+apply plugin: 'osgi'
+
+dependencies {
+    compile project(':rxjava-core')
+    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.+'
+    provided 'junit:junit-dep:4.10'
+    provided 'org.mockito:mockito-core:1.8.5'
+}
+
+jar {
+    manifest {
+        name = 'rxjava-kotlin'
+        instruction 'Bundle-Vendor', 'Netflix'
+        instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
+        instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
+        instruction 'Fragment-Host', 'com.netflix.rxjava.core'
+    }
+}

language-adaptors/rxjava-kotlin/build.gradle

@@ -4,6 +4,7 @@ include 'rxjava-core', \
 'language-adaptors:rxjava-clojure', \
 'language-adaptors:rxjava-jruby', \
 'language-adaptors:rxjava-scala', \
+'language-adaptors:rxjava-kotlin', \
 'rxjava-contrib:rxjava-swing', \
 'rxjava-contrib:rxjava-android', \
 'rxjava-contrib:rxjava-apache-http'