Update Kotlin to 1.9.10, and related Maven packages. (#1115)

* Update Kotlin to 1.9.10, and related Maven packages. Apply ktlint fixes from ktlint 0.50.0. * Update jicoco version.
jitsi · Sep 27, 2023 · ea5b27f · ea5b27f
1 parent 6508af3
commit ea5b27f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/jingle/JingleSession.kt b/jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/jingle/JingleSession.kt
@@ -123,7 +123,8 @@ class JingleSession(
             JingleAction.TRANSPORT_ACCEPT -> requestHandler.onTransportAccept(this, iq.contentList)
             JingleAction.TRANSPORT_INFO -> requestHandler.onTransportInfo(this, iq.contentList)
             JingleAction.TRANSPORT_REJECT -> {
-                requestHandler.onTransportReject(this, iq); null
+                requestHandler.onTransportReject(this, iq)
+                null
             }
 
             JingleAction.ADDSOURCE, JingleAction.SOURCEADD -> requestHandler.onAddSource(this, iq.contentList)

diff --git a/jicofo-selector/pom.xml b/jicofo-selector/pom.xml
@@ -203,6 +203,11 @@
       <artifactId>jicoco-test-kotlin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.mockk</groupId>
+      <artifactId>mockk-jvm</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/jicofo/pom.xml b/jicofo/pom.xml
@@ -145,6 +145,11 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.mockk</groupId>
+      <artifactId>mockk-jvm</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.test-framework</groupId>
       <artifactId>jersey-test-framework-core</artifactId>

diff --git a/jicofo/spotbugs-exclude.xml b/jicofo/spotbugs-exclude.xml
@@ -32,6 +32,8 @@
       <!-- False positives with kotlin 1.6. -->
       <Bug pattern="NP_NONNULL_PARAM_VIOLATION"/>
       <Bug pattern="SA_LOCAL_SELF_ASSIGNMENT"/>
+      <!-- False positive with kotlin lazy initialization. -->
+      <Bug pattern="BC_IMPOSSIBLE_INSTANCEOF"/>
     </Or>
   </And>
 </Match>

diff --git a/pom.xml b/pom.xml
@@ -37,15 +37,16 @@
     <jetty.version>11.0.14</jetty.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <smack.version>4.4.6</smack.version>
-    <kotlin.version>1.6.21</kotlin.version>
-    <kotest.version>5.3.0</kotest.version>
+    <kotlin.version>1.9.10</kotlin.version>
+    <kotest.version>5.7.2</kotest.version>
     <slf4j.version>1.7.32</slf4j.version>
     <jersey.version>3.0.10</jersey.version>
-    <jitsi.utils.version>1.0-126-g02b0c86</jitsi.utils.version>
-    <jicoco.version>1.1-126-g1f776be</jicoco.version>
-    <ktlint-maven-plugin.version>1.16.0</ktlint-maven-plugin.version>
+    <jitsi.utils.version>1.0-127-g6c65524</jitsi.utils.version>
+    <jicoco.version>1.1-127-gf49982f</jicoco.version>
+    <ktlint-maven-plugin.version>2.0.0</ktlint-maven-plugin.version>
     <spotbugs.version>4.6.0</spotbugs.version>
-    <junit.version>5.8.2</junit.version>
+    <junit.version>5.10.0</junit.version>
+    <mockk.version>1.13.8</mockk.version>
   </properties>
   <build>
     <plugins>
@@ -177,7 +178,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>jitsi-xmpp-extensions</artifactId>
-        <version>1.0-75-g4664207</version>
+        <version>1.0-76-ge98f8af</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -324,6 +325,12 @@
         <version>${jicoco.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>io.mockk</groupId>
+        <artifactId>mockk-jvm</artifactId>
+        <version>${mockk.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <profiles>