Merge pull request #131 from nhaarman/release-1.0.0

Release 1.0.0
mockito · Dec 6, 2016 · 543238f · 543238f
2 parents 04cd24d + ed6d30d
commit 543238f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle/scripts/tagging.gradle b/gradle/scripts/tagging.gradle
@@ -1,7 +1,7 @@
 new ByteArrayOutputStream().withStream { os ->
 
   exec {
-    commandLine 'git', 'describe'
+    commandLine 'git', 'describe', '--abbrev=0', '--tags'
     standardOutput = os
   }
 

diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.9"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.10"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
     }
@@ -28,7 +28,7 @@ repositories {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile "org.mockito:mockito-core:2.2.22"
+    compile "org.mockito:mockito-core:2.2.28"
 
     /* Tests */
     testCompile "junit:junit:4.12"