From 27ad37d1af4262e570ecb2c7ac5c5d2cca5cdded Mon Sep 17 00:00:00 2001 From: Jonathan Lennox Date: Fri, 29 Sep 2023 12:22:20 -0400 Subject: [PATCH] Update Kotlin to 1.9.10, and related Maven packages, and jitsi-utils and jicoco. (#271) * Update Kotlin to 1.9.10, and related Maven packages, and jitsi-utils and jicoco. * Update ktlint-maven-plugin. --- .editorconfig | 7 ++++++ pom.xml | 23 ++++++++++++------- .../org/ice4j/util/PeriodicRunnableTests.java | 9 ++------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9ae523a..8f40359 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,3 +7,10 @@ charset = utf-8 indent_size = 2 indent_style = space max_line_length = 120 + +[*.{kt,kts}] +max_line_length = 120 + +# I find trailing commas annoying +ktlint_standard_trailing-comma-on-call-site = disabled +ktlint_standard_trailing-comma-on-declaration-site = disabled diff --git a/pom.xml b/pom.xml index 128c620..f93c740 100644 --- a/pom.xml +++ b/pom.xml @@ -38,10 +38,11 @@ UTF-8 - 1.1-104-g20c4353 - 1.6.21 - 5.3.0 - 5.8.2 + 1.1-127-gf49982f + 1.9.10 + 1.9.0 + 5.7.2 + 5.10.0 @@ -58,7 +59,7 @@ ${project.groupId} jitsi-utils - 1.0-114-g43815ed + 1.0-127-g6c65524 ${project.groupId} @@ -70,7 +71,7 @@ org.junit.platform junit-platform-launcher - 1.8.2 + 1.10.0 test @@ -109,6 +110,12 @@ 4.5.1 test + + io.mockk + mockk-jvm + 1.13.8 + test + @@ -214,7 +221,7 @@ com.github.gantsign.maven ktlint-maven-plugin - 1.13.1 + 2.0.0 ${project.basedir}/src/main/kotlin @@ -487,7 +494,7 @@ org.jetbrains.dokka dokka-maven-plugin - ${kotlin.version} + ${dokka.version} package diff --git a/src/test/java/org/ice4j/util/PeriodicRunnableTests.java b/src/test/java/org/ice4j/util/PeriodicRunnableTests.java index 446f19e..454fc2b 100644 --- a/src/test/java/org/ice4j/util/PeriodicRunnableTests.java +++ b/src/test/java/org/ice4j/util/PeriodicRunnableTests.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.*; import java.time.*; import java.util.concurrent.*; -import org.jitsi.test.concurrent.*; +import org.jitsi.utils.concurrent.*; import org.junit.jupiter.api.*; /** @@ -21,12 +21,7 @@ public class PeriodicRunnableTests @BeforeEach void beforeEach() { - timer = mock( - FakeScheduledExecutorService.class, - withSettings() - .useConstructor() - .defaultAnswer(CALLS_REAL_METHODS) - ); + timer = new FakeScheduledExecutorService(); executor = mock(ExecutorService.class); when(executor.submit(any(Runnable.class))).thenAnswer(a -> {