Merge pull request #693 from MarioAriasC/master

benjchristensen · benjchristensen · commit c9e4c150e21b · 2013-12-26T08:15:48.000-08:00
Kotlin M6.2
diff --git a/language-adaptors/rxjava-kotlin/build.gradle b/language-adaptors/rxjava-kotlin/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.6.800'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.6.1673'
     }
 }
 
@@ -13,7 +13,7 @@ apply plugin: 'osgi'
 
 dependencies {
     compile project(':rxjava-core')
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.800'
+    compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'
     provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.6.800'`
	`7`	`+ classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.6.1673'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`@@ -13,7 +13,7 @@ apply plugin: 'osgi'`
`13`	`13`
`14`	`14`	`dependencies {`
`15`	`15`	`compile project(':rxjava-core')`
`16`		`- compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.800'`
	`16`	`+ compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'`
`17`	`17`	`provided 'junit:junit-dep:4.10'`
`18`	`18`	`provided 'org.mockito:mockito-core:1.8.5'`
`19`	`19`	`}`