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.
This commit is contained in:
Jonathan Lennox 2023-09-29 12:22:20 -04:00 committed by GitHub
parent 9fe2d69cf1
commit 27ad37d1af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 15 deletions

View File

@ -7,3 +7,10 @@ charset = utf-8
indent_size = 2 indent_size = 2
indent_style = space indent_style = space
max_line_length = 120 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

23
pom.xml
View File

@ -38,10 +38,11 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jicoco.version>1.1-104-g20c4353</jicoco.version> <jicoco.version>1.1-127-gf49982f</jicoco.version>
<kotlin.version>1.6.21</kotlin.version> <kotlin.version>1.9.10</kotlin.version>
<kotest.version>5.3.0</kotest.version> <dokka.version>1.9.0</dokka.version>
<junit.version>5.8.2</junit.version> <kotest.version>5.7.2</kotest.version>
<junit.version>5.10.0</junit.version>
</properties> </properties>
<dependencies> <dependencies>
@ -58,7 +59,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jitsi-utils</artifactId> <artifactId>jitsi-utils</artifactId>
<version>1.0-114-g43815ed</version> <version>1.0-127-g6c65524</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
@ -70,7 +71,7 @@
<dependency> <dependency>
<groupId>org.junit.platform</groupId> <groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId> <artifactId>junit-platform-launcher</artifactId>
<version>1.8.2</version> <version>1.10.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -109,6 +110,12 @@
<version>4.5.1</version> <version>4.5.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk-jvm</artifactId>
<version>1.13.8</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -214,7 +221,7 @@
<plugin> <plugin>
<groupId>com.github.gantsign.maven</groupId> <groupId>com.github.gantsign.maven</groupId>
<artifactId>ktlint-maven-plugin</artifactId> <artifactId>ktlint-maven-plugin</artifactId>
<version>1.13.1</version> <version>2.0.0</version>
<configuration> <configuration>
<sourceRoots> <sourceRoots>
<sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot> <sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>
@ -487,7 +494,7 @@
<plugin> <plugin>
<groupId>org.jetbrains.dokka</groupId> <groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId> <artifactId>dokka-maven-plugin</artifactId>
<version>${kotlin.version}</version> <version>${dokka.version}</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

View File

@ -5,7 +5,7 @@ import static org.mockito.Mockito.*;
import java.time.*; import java.time.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import org.jitsi.test.concurrent.*; import org.jitsi.utils.concurrent.*;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
/** /**
@ -21,12 +21,7 @@ public class PeriodicRunnableTests
@BeforeEach @BeforeEach
void beforeEach() void beforeEach()
{ {
timer = mock( timer = new FakeScheduledExecutorService();
FakeScheduledExecutorService.class,
withSettings()
.useConstructor()
.defaultAnswer(CALLS_REAL_METHODS)
);
executor = mock(ExecutorService.class); executor = mock(ExecutorService.class);
when(executor.submit(any(Runnable.class))).thenAnswer(a -> when(executor.submit(any(Runnable.class))).thenAnswer(a ->
{ {