Skip to content

Commit 543238f

Browse files
authored
Merge pull request #131 from nhaarman/release-1.0.0
Release 1.0.0
2 parents 04cd24d + ed6d30d commit 543238f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

gradle/scripts/tagging.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
new ByteArrayOutputStream().withStream { os ->
22

33
exec {
4-
commandLine 'git', 'describe'
4+
commandLine 'git', 'describe', '--abbrev=0', '--tags'
55
standardOutput = os
66
}
77

mockito-kotlin/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313

1414
dependencies {
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
16-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.9"
16+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.10"
1717
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
1818
classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
1919
}
@@ -28,7 +28,7 @@ repositories {
2828
dependencies {
2929
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3030
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
31-
compile "org.mockito:mockito-core:2.2.22"
31+
compile "org.mockito:mockito-core:2.2.28"
3232

3333
/* Tests */
3434
testCompile "junit:junit:4.12"

0 commit comments

Comments
 (0)