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

* Update Kotlin to 1.9.10, and related Maven packages. Apply ktlint fixes from ktlint 0.50.0. * Fix dokka version (used by release build).
bgrozev · Sep 27, 2023 · f49982f · f49982f
1 parent 1f776be
commit f49982f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,10 +4,15 @@ insert_final_newline = true
 charset = utf-8
 
 [*.{kt,kts}]
+max_line_length=120
+
 # Comma-separated list of rules to disable (Since 0.34.0)
 # Note that rules in any ruleset other than the standard ruleset will need to be prefixed 
 # by the ruleset identifier.
-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
 
 [pom.xml]
 indent_style = space

diff --git a/jicoco-metrics/pom.xml b/jicoco-metrics/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>1.8.2</version>
+            <version>1.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/jicoco-metrics/src/main/kotlin/org/jitsi/metrics/MetricsContainer.kt b/jicoco-metrics/src/main/kotlin/org/jitsi/metrics/MetricsContainer.kt
@@ -110,8 +110,12 @@ open class MetricsContainer @JvmOverloads constructor(
         /** the optional initial value of the metric */
         initialValue: Long = 0
     ): CounterMetric {
-        val newName = if (name.endsWith("_total")) name else "${name}_total".also {
-            logger.debug("Counter '$name' was renamed to '$it' to ensure consistent metric naming.")
+        val newName = if (name.endsWith("_total")) {
+            name
+        } else {
+            "${name}_total".also {
+                logger.debug("Counter '$name' was renamed to '$it' to ensure consistent metric naming.")
+            }
         }
         if (metrics.containsKey(newName) or metrics.containsKey(name)) {
             if (checkForNameConflicts) {

diff --git a/jicoco-test-kotlin/pom.xml b/jicoco-test-kotlin/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>io.mockk</groupId>
             <artifactId>mockk</artifactId>
-            <version>1.12.3</version>
+            <version>${mockk.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/jicoco/pom.xml b/jicoco/pom.xml
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>1.8.2</version>
+            <version>1.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -149,7 +149,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.5.1</version>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -58,10 +58,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.version>5.8.2</junit.version>
-        <kotlin.version>1.6.21</kotlin.version>
-        <kotest.version>5.3.0</kotest.version>
+        <junit.version>5.10.0</junit.version>
+        <kotlin.version>1.9.10</kotlin.version>
+        <kotest.version>5.7.2</kotest.version>
+        <mockk.version>1.13.8</mockk.version>
         <prometheus.version>0.16.0</prometheus.version>
+        <dokka.version>1.9.0</dokka.version>
         <jetty.version>11.0.14</jetty.version>
         <jersey.version>3.0.10</jersey.version>
         <smack.version>4.4.6</smack.version>
@@ -92,7 +94,7 @@
                 <plugin>
                     <groupId>org.jetbrains.dokka</groupId>
                     <artifactId>dokka-maven-plugin</artifactId>
-                    <version>${kotlin.version}</version>
+                    <version>${dokka.version}</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -119,7 +121,7 @@
             <plugin>
                 <groupId>com.github.gantsign.maven</groupId>
                 <artifactId>ktlint-maven-plugin</artifactId>
-                <version>1.13.1</version>
+                <version>2.0.0</version>
                 <configuration>
                     <sourceRoots>
                         <sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>