Skip to content

Commit c248ee3

Browse files
committed
Update Kotlin to 1.3.0
1 parent 3139a2c commit c248ee3

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ matrix:
1111
- jdk: oraclejdk8
1212
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50
1313
- jdk: oraclejdk8
14-
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0-rc-116
14+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0
1515
- jdk: oraclejdk8
1616
env: TERM=dumb KOTLIN_VERSION=1.0.7
1717
- jdk: oraclejdk8
1818
env: TERM=dumb KOTLIN_VERSION=1.1.61
1919
- jdk: oraclejdk8
2020
env: TERM=dumb KOTLIN_VERSION=1.2.50
2121
- jdk: oraclejdk8
22-
env: TERM=dumb KOTLIN_VERSION=1.3.0-rc-116
22+
env: TERM=dumb KOTLIN_VERSION=1.3.0
2323

2424

2525
env:

mockito-kotlin/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ apply from: '../publishing.gradle'
33
apply plugin: 'org.jetbrains.dokka'
44

55
buildscript {
6-
ext.kotlin_version = "1.3.0-rc-146"
6+
ext.kotlin_version = "1.3.0"
77

88
repositories {
99
mavenCentral()
1010
jcenter()
11-
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
1211
}
1312

1413
dependencies {
@@ -22,22 +21,21 @@ buildscript {
2221
repositories {
2322
mavenCentral()
2423
jcenter()
25-
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
2624
}
2725

2826
dependencies {
2927
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
30-
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'
28+
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
3129

3230
compile "org.mockito:mockito-core:2.23.0"
3331

3432
testCompile 'junit:junit:4.12'
3533
testCompile 'com.nhaarman:expect.kt:1.0.0'
3634

3735
testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
38-
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'
36+
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
3937

40-
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.0-eap13"
38+
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0"
4139
}
4240

4341
dokka {

tests/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
buildscript {
22
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7'
3-
ext.kotlin_version = '1.3.0-rc-116'
3+
ext.kotlin_version = '1.3.0'
44

55
repositories {
66
mavenCentral()
7-
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
87
}
98
dependencies {
109
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -17,7 +16,6 @@ apply plugin: 'kotlin'
1716
repositories {
1817
mavenCentral()
1918
jcenter()
20-
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
2119
}
2220

2321
dependencies {

0 commit comments

Comments
 (0)