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

* Update Kotlin to 1.9.10, and related Maven packages. * Update jitsi-xmpp-extensions version. * Update jicoco version.
jitsi · Sep 27, 2023 · 13803c8 · 13803c8
1 parent ea56278
commit 13803c8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/jitsi-media-transform/pom.xml b/jitsi-media-transform/pom.xml
@@ -125,8 +125,9 @@
         </dependency>
         <dependency>
             <groupId>io.mockk</groupId>
-            <artifactId>mockk</artifactId>
-            <version>1.12.4</version>
+            <artifactId>mockk-jvm</artifactId>
+            <version>${mockk.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>

diff --git a/jvb/pom.xml b/jvb/pom.xml
@@ -209,8 +209,8 @@
     <!-- test -->
     <dependency>
       <groupId>io.mockk</groupId>
-      <artifactId>mockk</artifactId>
-      <version>1.12.4</version>
+      <artifactId>mockk-jvm</artifactId>
+      <version>${mockk.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
@@ -567,6 +567,7 @@ class Endpoint @JvmOverloads constructor(
         }
     }
 
+    @Deprecated("use sendVideoConstraintsV2")
     override fun sendVideoConstraints(maxVideoConstraints: VideoConstraints) {
         // Note that it's up to the client to respect these constraints.
         if (mediaSources.isEmpty()) {

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt
@@ -144,6 +144,7 @@ class RelayedEndpoint(
 
     override fun setExtmapAllowMixed(allow: Boolean) = streamInformationStore.setExtmapAllowMixed(allow)
 
+    @Deprecated("use sendVideoConstraintsV2")
     override fun sendVideoConstraints(maxVideoConstraints: VideoConstraints) {
         relay.sendMessage(
             AddReceiverMessage(

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/KotestProjectConfig.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/KotestProjectConfig.kt
@@ -21,7 +21,7 @@ import org.jitsi.metaconfig.MetaconfigSettings
 import org.jitsi.videobridge.metrics.VideobridgeMetricsContainer
 
 class KotestProjectConfig : AbstractProjectConfig() {
-    override fun beforeAll() = super.beforeAll().also {
+    override suspend fun beforeProject() = super.beforeProject().also {
         // The only purpose of config caching is performance. We always want caching disabled in tests (so we can
         // freely modify the config without affecting other tests executing afterwards).
         MetaconfigSettings.cacheEnabled = false

diff --git a/pom.xml b/pom.xml
@@ -24,13 +24,14 @@
 
     <properties>
         <jetty.version>11.0.14</jetty.version>
-        <kotlin.version>1.6.21</kotlin.version>
-        <kotest.version>5.5.5</kotest.version>
-        <junit.version>5.9.1</junit.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>
-        <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
+        <kotlin.version>1.9.10</kotlin.version>
+        <kotest.version>5.7.2</kotest.version>
+        <junit.version>5.10.0</junit.version>
+        <jitsi.utils.version>1.0-127-g6c65524</jitsi.utils.version>
+        <jicoco.version>1.1-127-gf49982f</jicoco.version>
+        <mockk.version>1.13.8</mockk.version>
+        <ktlint-maven-plugin.version>2.0.0</ktlint-maven-plugin.version>
+        <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
         <spotbugs.version>4.6.0</spotbugs.version>
         <jersey.version>3.0.10</jersey.version>
         <jackson.version>2.12.4</jackson.version>
@@ -110,7 +111,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>jitsi-xmpp-extensions</artifactId>
-                <version>1.0-75-g4664207</version>
+                <version>1.0-76-ge98f8af</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/rtp/spotbugs-exclude.xml b/rtp/spotbugs-exclude.xml
@@ -30,6 +30,9 @@
 
     <!-- False positives with kotlin 1.5 -->
     <Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE"/>
+
+    <!-- Tests are often testing whether a value is not null, and should throw NPE if not -->
+    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
   </Or>
   <Or>
     <Source name="~.*\.*Test.kt" />