Merge pull request #276 from kennethshackleton/dependency-updates

Dependency updates
bloomberg · Jan 5, 2022 · ac07d3a · ac07d3a
2 parents 95bbc3a + a8511a2
commit ac07d3a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/Lib/src/test/kotlin/com/bloomberg/selekt/pools/CommonObjectPoolTest.kt b/Lib/src/test/kotlin/com/bloomberg/selekt/pools/CommonObjectPoolTest.kt
@@ -30,7 +30,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.same
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyZeroInteractions
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import org.mockito.stubbing.Answer
 import java.io.IOException
@@ -343,7 +343,7 @@ internal class CommonObjectPoolTest {
         val obj = PooledObject()
         whenever(other.borrowObjectOrNull()) doReturn obj
         repeat(configuration.maxTotal) { borrowObject() }
-        verifyZeroInteractions(other)
+        verifyNoInteractions(other)
         borrowObject()
         verify(other, times(1)).borrowObjectOrNull()
     }

diff --git a/Lib/src/test/kotlin/com/bloomberg/selekt/pools/TieredObjectPoolTest.kt b/Lib/src/test/kotlin/com/bloomberg/selekt/pools/TieredObjectPoolTest.kt
@@ -25,7 +25,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.same
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyZeroInteractions
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import java.util.concurrent.TimeUnit
 
@@ -41,21 +41,21 @@ internal class TieredObjectPoolTest {
     fun borrowPrimaryObject() {
         pool.borrowPrimaryObject()
         verify(singleObjectPool, times(1)).borrowObject()
-        verifyZeroInteractions(commonObjectPool)
+        verifyNoInteractions(commonObjectPool)
     }
 
     @Test
     fun borrowSecondaryObjectKeyed() {
         val key = ""
         pool.borrowObject(key)
-        verifyZeroInteractions(singleObjectPool)
+        verifyNoInteractions(singleObjectPool)
         verify(commonObjectPool, times(1)).borrowObject(same(key))
     }
 
     @Test
     fun borrowSecondaryObject() {
         pool.borrowObject()
-        verifyZeroInteractions(singleObjectPool)
+        verifyNoInteractions(singleObjectPool)
         verify(commonObjectPool, times(1)).borrowObject()
     }
 
@@ -73,7 +73,7 @@ internal class TieredObjectPoolTest {
         }
         pool.returnObject(obj)
         verify(singleObjectPool, times(1)).returnObject(same(obj))
-        verifyZeroInteractions(commonObjectPool)
+        verifyNoInteractions(commonObjectPool)
     }
 
     @Test
@@ -83,7 +83,7 @@ internal class TieredObjectPoolTest {
         }
         pool.returnObject(obj)
         verify(commonObjectPool, times(1)).returnObject(same(obj))
-        verifyZeroInteractions(singleObjectPool)
+        verifyNoInteractions(singleObjectPool)
     }
 
     @Test

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -28,26 +28,26 @@ enum class Versions(
     ANDROID_SDK("31", URL("https://developer.android.com/sdk")),
     ANDROIDX_LIVE_DATA("2.2.0", URL("https://developer.android.com/topic/libraries/architecture/livedata")),
     ANDROIDX_ROOM("2.2.5", URL("https://developer.android.com/jetpack/androidx/releases/room")),
-    ASSERT_J("3.20.2", URL("https://joel-costigliola.github.io/assertj")),
+    ASSERT_J("3.22.0", URL("https://joel-costigliola.github.io/assertj")),
     CMAKE("3.18.1", URL("https://cmake.org")),
-    DETEKT("1.18.0", URL("https://github.com/arturbosch/detekt")),
-    DOKKA("1.6.0", URL("https://github.com/Kotlin/dokka")),
+    DETEKT("1.19.0", URL("https://github.com/arturbosch/detekt")),
+    DOKKA("1.6.10", URL("https://github.com/Kotlin/dokka")),
     GRADLE_LICENSEE_PLUGIN("1.1.0", URL("https://github.com/cashapp/licensee")),
     JACOCO("0.8.7", URL("https://www.jacoco.org/jacoco/trunk/doc/changes.html")),
-    JMH("1.33", URL("https://openjdk.java.net/projects/code-tools/jmh/")),
+    JMH("1.34", URL("https://openjdk.java.net/projects/code-tools/jmh/")),
     JSR_305("3.0.2", URL("https://code.google.com/archive/p/jsr-305/")),
     JUNIT4("4.13.1", URL("https://github.com/junit-team/junit4")),
     JUNIT5("5.7.2", URL("https://junit.org/junit5/")),
     JUNIT5_PLATFORM("1.7.2", URL("https://junit.org/junit5/")),
     KOTLIN("1.6.10", URL("https://github.com/JetBrains/kotlin")),
-    KOTLIN_COROUTINES("1.5.1", URL("https://github.com/Kotlin/kotlinx.coroutines")),
+    KOTLIN_COROUTINES("1.5.2", URL("https://github.com/Kotlin/kotlinx.coroutines")),
     KOTLIN_TEST("1.4.32", URL("https://github.com/JetBrains/kotlin")),
-    KTLINT("0.42.1", URL("https://github.com/pinterest/ktlint")),
-    KTLINT_GRADLE_PLUGIN("10.2.0", URL("https://github.com/JLLeitschuh/ktlint-gradle")),
-    MOCKITO("3.11.2", URL("https://github.com/mockito/mockito")),
-    MOCKITO_KOTLIN("3.2.0", URL("https://github.com/nhaarman/mockito-kotlin")),
+    KTLINT("0.43.2", URL("https://github.com/pinterest/ktlint")),
+    KTLINT_GRADLE_PLUGIN("10.2.1", URL("https://github.com/JLLeitschuh/ktlint-gradle")),
+    MOCKITO("4.0.0", URL("https://github.com/mockito/mockito")),
+    MOCKITO_KOTLIN(MOCKITO.version, URL("https://github.com/mockito/mockito-kotlin")),
     NEXUS_PLUGIN("1.1.0", URL("https://github.com/gradle-nexus/publish-plugin")),
-    ROBOLECTRIC("4.7.2", URL("https://github.com/robolectric/robolectric"));
+    ROBOLECTRIC("4.7.3", URL("https://github.com/robolectric/robolectric"));
 
     override fun toString() = version
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip