various dependency updates

robfletcher · Oct 12, 2023 · dcdce38 · dcdce38
1 parent 8dd1828
commit dcdce38
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,11 +10,11 @@ import kotlin.text.RegexOption.IGNORE_CASE
 plugins {
   kotlin("jvm") apply false
   id("io.codearte.nexus-staging") version "0.30.0"
-  id("org.jmailen.kotlinter") version "3.16.0" apply false
-  id("com.adarshr.test-logger") version "3.2.0" apply false
-  id("com.github.ben-manes.versions") version "0.48.0"
+  id("org.jmailen.kotlinter") version "4.0.0" apply false
+  id("com.adarshr.test-logger") version "4.0.0" apply false
+  id("com.github.ben-manes.versions") version "0.49.0"
   id("org.jetbrains.dokka")
-  id("org.jetbrains.kotlinx.kover") version "0.7.3"
+  id("org.jetbrains.kotlinx.kover") version "0.7.4"
 }
 
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ versions.junit=5.10.0
 versions.kotlin=1.9.10
 versions.kotlinx-coroutines=1.7.3
 versions.minutest=1.13.0
-versions.mockk=1.13.7
-versions.protobuf=3.24.3
+versions.mockk=1.13.8
+versions.protobuf=3.24.4
 versions.opentest4j=1.3.0
 versions.spring-boot=3.1.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/strikt-core/src/main/kotlin/strikt/api/Status.kt b/strikt-core/src/main/kotlin/strikt/api/Status.kt
@@ -9,7 +9,7 @@ internal sealed class Status {
   /**
    * The assertion was not evaluated or has not been evaluated yet.
    */
-  object Pending : Status()
+  data object Pending : Status()
 
   /**
    * The assertion passed.

diff --git a/strikt-core/src/main/kotlin/strikt/internal/AssertionStrategy.kt b/strikt-core/src/main/kotlin/strikt/internal/AssertionStrategy.kt
@@ -112,9 +112,9 @@ internal sealed class AssertionStrategy {
     cause: Throwable? = null,
   ): Status = Failed(description, comparison, cause)
 
-  object Collecting : AssertionStrategy()
+  data object Collecting : AssertionStrategy()
 
-  object Throwing : AssertionStrategy() {
+  data object Throwing : AssertionStrategy() {
     override fun evaluate(tree: AssertionGroup<*>) {
       if (tree.status is Failed) {
         throw CompoundAssertionFailure(

diff --git a/strikt-core/src/test/kotlin/strikt/assertions/Assertions.kt b/strikt-core/src/test/kotlin/strikt/assertions/Assertions.kt
@@ -14,7 +14,7 @@ internal object Assertions {
       fixture { expectThat(false) }
 
       test("exceptions are suppressed") {
-        expectThrows<AssertionError>() {
+        expectThrows<AssertionError> {
           isEqualTo(true)
         }
           .and {

diff --git a/strikt-mockk/src/test/kotlin/strikt/mockk/CapturingSlotAssertions.kt b/strikt-mockk/src/test/kotlin/strikt/mockk/CapturingSlotAssertions.kt
@@ -22,7 +22,7 @@ class CapturingSlotAssertions : JUnit5Minutests {
 
   private class Fixture {
     val slot = slot<String>()
-    val mockFunction: Consumer<String> = mockk() {
+    val mockFunction: Consumer<String> = mockk {
       every { accept(capture(slot)) } just Runs
     }
   }