Skip to content

Commit

Permalink
Merge pull request #304 from nhaarman/update-build
Browse files Browse the repository at this point in the history
Update build
  • Loading branch information
nhaarman authored Oct 30, 2018
2 parents 3139a2c + c8bd946 commit ec75b8a
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ matrix:
- jdk: oraclejdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50
- jdk: oraclejdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0-rc-116
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0
- jdk: oraclejdk8
env: TERM=dumb KOTLIN_VERSION=1.0.7
- jdk: oraclejdk8
env: TERM=dumb KOTLIN_VERSION=1.1.61
- jdk: oraclejdk8
env: TERM=dumb KOTLIN_VERSION=1.2.50
- jdk: oraclejdk8
env: TERM=dumb KOTLIN_VERSION=1.3.0-rc-116
env: TERM=dumb KOTLIN_VERSION=1.3.0


env:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ buildscript {
}
}
dependencies {
classpath "io.spring.gradle:spring-bintray-plugin:0.9.0"
classpath "io.spring.gradle:spring-bintray-plugin:0.11.1"
}
}

plugins {
id 'com.github.ben-manes.versions' version '0.17.0'
id 'com.github.ben-manes.versions' version '0.20.0'
}

apply from: 'gradle/scripts/tagging.gradle'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Dec 03 21:34:47 CET 2017
#Mon Oct 29 21:53:52 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
16 changes: 7 additions & 9 deletions mockito-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,39 @@ apply from: '../publishing.gradle'
apply plugin: 'org.jetbrains.dokka'

buildscript {
ext.kotlin_version = "1.3.0-rc-146"
ext.kotlin_version = "1.3.0"

repositories {
mavenCentral()
jcenter()
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.15"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
}
}

repositories {
mavenCentral()
jcenter()
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}

dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'

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

testCompile 'junit:junit:4.12'
testCompile 'com.nhaarman:expect.kt:1.0.0'

testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'

testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.0-eap13"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0"
}

dokka {
Expand Down
6 changes: 2 additions & 4 deletions tests/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
buildscript {
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7'
ext.kotlin_version = '1.3.0-rc-116'
ext.kotlin_version = '1.3.0'

repositories {
mavenCentral()
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -17,14 +16,13 @@ apply plugin: 'kotlin'
repositories {
mavenCentral()
jcenter()
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
}

dependencies {
compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${rootProject.ext.versionName}.jar")

compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.mockito:mockito-core:2.19.0"
compile "org.mockito:mockito-core:2.23.0"

testCompile "junit:junit:4.12"
testCompile "com.nhaarman:expect.kt:1.0.0"
Expand Down

0 comments on commit ec75b8a

Please sign in to comment.