Skip to content

Commit 99bb9fe

Browse files
committed
Merge pull request #26 from MarioAriasC/master
M14
2 parents 6ed499b + af30bc8 commit 99bb9fe

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '0.13.1513'
2+
ext.kotlin_version = '0.14.449'
33
repositories { jcenter() }
44
dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:2.+',
55
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" }
@@ -11,7 +11,7 @@ apply plugin: 'kotlin'
1111
dependencies {
1212
compile 'io.reactivex:rxjava:1.0.+'
1313
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
14-
compile 'org.funktionale:funktionale:0.6_M13'
14+
testCompile 'org.funktionale:funktionale:0.6_M14'
1515
testCompile 'junit:junit:4.12'
1616
testCompile 'org.mockito:mockito-core:1.8.5'
1717
examplesCompile 'com.squareup.retrofit:retrofit:1.9.+'

src/examples/kotlin/rx/lang/kotlin/examples/retrofit.kt renamed to src/examples/kotlin/rx/lang/kotlin/examples/retrofit/retrofit.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package rx.lang.kotlin.examples.retrofit
22

3-
import retrofit.http.GET
4-
import retrofit.http.Path
5-
import rx.Observable
63
import retrofit.RestAdapter
4+
import retrofit.http.GET
75
import retrofit.http.Query
6+
import rx.Observable
87

98
data class SearchResultEntry(val id : String, val latestVersion : String)
109
data class SearchResults(val docs : List<SearchResultEntry>)

0 commit comments

Comments
 (0)