Skip to content

Commit

Permalink
Update Kotlin to 1.0.5-2
Browse files Browse the repository at this point in the history
  • Loading branch information
nhaarman committed Nov 15, 2016
1 parent b665264 commit e6f6d2c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ language: java
matrix:
include:
- jdk: oraclejdk7
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5-2
- jdk: oraclejdk7
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M02
- jdk: oraclejdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5
env: TERM=dumb KOTLIN_VERSION=1.0.5-2
- jdk: oraclejdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M02
env: TERM=dumb KOTLIN_VERSION=1.1-M02


env:
Expand Down
2 changes: 1 addition & 1 deletion mockito-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply from: './publishing.gradle'
apply plugin: 'org.jetbrains.dokka'

buildscript {
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.5'
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.5-2'

repositories {
mavenCentral()
Expand Down

0 comments on commit e6f6d2c

Please sign in to comment.