Include multiplatform dependencies for version locking

apache · Nov 16, 2024 · 704c6e2 · 704c6e2
1 parent e796a95
commit 704c6e2
Show file tree

Hide file tree

Showing 20 changed files with 4,501 additions and 3,738 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,8 +26,8 @@ plugins {
   alias(libs.plugins.owasp.dependencycheck)
   alias(libs.plugins.cutterslade.analyze)
   alias(libs.plugins.benmanes.versions)
-  alias(libs.plugins.kotlinMultiplatform) apply false
-  alias(libs.plugins.jetbrainsCompose) apply false
+  alias(libs.plugins.kotlin.multiplatform) apply false
+  alias(libs.plugins.jetbrains.compose) apply false
   alias(libs.plugins.littlerobots.versioncatalogupdate) apply false
   alias(libs.plugins.thetaphi.forbiddenapis) apply false
   alias(libs.plugins.undercouch.download) apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -140,12 +140,18 @@ jaxb = "2.3.8"
 jayway-jsonpath = "2.9.0"
 jctools = "4.0.5"
 jersey = "3.1.9"
+# @keep for version alignment
+jetbrains-annotations = "23.0.0"
 # TODO Sync with jersey versions
 jersey-containers = "2.39.1"
 # @keep for version alignment
 joda-time = "2.8.1"
 junit = "4.13.2"
 kotlin = "2.0.21"
+# @keep for version alignment
+kotlinx-atomicfu = "0.25.0"
+# @keep for version alignment
+kotlinx-browser = "0.2"
 kotlinx-coroutines = "1.9.0"
 kotlinx-datetime = "0.6.1"
 kotlinx-serialization = "1.7.3"
@@ -180,7 +186,7 @@ prometheus-metrics = "1.1.0"
 prometheus-simpleclient = "0.16.0"
 quicktheories = "0.26"
 semver4j = "5.3.0"
-slf4j = "2.0.13"
+slf4j = "2.0.16"
 spatial4j = "0.8"
 spotbugs = "4.8.6"
 squareup-okhttp3-mockwebserver = "4.11.0"
@@ -201,9 +207,9 @@ carrotsearch-dependencychecks = { id = "com.carrotsearch.gradle.dependencychecks
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 cutterslade-analyze = { id = "ca.cutterslade.analyze", version.ref = "cutterslade-analyze" }
 diffplug-spotless = { id = "com.diffplug.spotless", version.ref = "diffplug-spotless" }
-jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
-kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 littlerobots-versioncatalogupdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "littlerobots-versioncatalogupdate" }
 ltgt-errorprone = { id = "net.ltgt.errorprone", version.ref = "ltgt-errorprone" }
 morethan-jmhreport = { id = "io.morethan.jmhreport", version.ref = "morethan-jmhreport" }
@@ -422,8 +428,16 @@ jersey-core-server = { module = "org.glassfish.jersey.core:jersey-server", versi
 jersey-inject-hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2", version.ref = "jersey" }
 jersey-media-jsonjackson = { module = "org.glassfish.jersey.media:jersey-media-json-jackson", version.ref = "jersey" }
 # @keep transitive dependency for version alignment
+jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
+# @keep transitive dependency for version alignment
 jodatime-jodatime = { module = "joda-time:joda-time", version.ref = "joda-time" }
 junit-junit = { module = "junit:junit", version.ref = "junit" }
+# @keep transitive dependency for version alignment
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+# @keep transitive dependency for version alignment
+kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinx-atomicfu" }
+# @keep transitive dependency for version alignment
+kotlinx-browser = { module = "org.jetbrains.kotlinx:kotlinx-browser", version.ref = "kotlinx-browser" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }

diff --git a/gradle/validation/dependencies.gradle b/gradle/validation/dependencies.gradle
@@ -43,6 +43,15 @@ allprojects {
                 "solrSlimTgz",
                 "testCompileClasspath",
                 "testRuntimeClasspath",
+                // KMP configurations
+                "desktopCompileClasspath",
+                "desktopRuntimeClasspath",
+                "desktopTestCompileClasspath",
+                "desktopTestRuntimeClasspath",
+                "wasmJsCompileClasspath",
+                "wasmJsRuntimeClasspath",
+                "wasmJsTestCompileClasspath",
+                "wasmJsTestRuntimeClasspath",
         ]
     }
 
@@ -191,6 +200,16 @@ allprojects {
                 handler.add(conf.name, libs.hamcrest.hamcrest, {
                     because 'version alignment for consistency across project'
                 })
+                handler.add(conf.name, libs.kotlin.stdlib, {
+                    because "version alignment for consistency across project" +
+                            "\n- Kotlin multiplatform plugin used by compose-ui module uses 2.0.21"
+                            "\n- ${getFullName(libs.squareup.okhttp3.okhttp)} uses 1.9.10"
+                })
+                handler.add(conf.name, libs.jetbrains.annotations, {
+                    because "version alignment for consistency across project" +
+                            "\n- Kotlin multiplatform plugin used by compose-ui module uses 23.0.0"
+                    "\n- ${getFullName(libs.squareup.okhttp3.okhttp)} uses 13.0"
+                })
 
                 // Add transitive dependencies as constraints to align versions
                 handler.add(conf.name, libs.checkerframework.qual, {
@@ -305,6 +324,14 @@ allprojects {
                             "\n- ${getFullName(libs.jersey.inject.hk2)} uses 3.0.6" +
                             "\n- ${getFullName(libs.hk2.api)} uses 3.1.1"
                 })
+                handler.add(conf.name, libs.kotlinx.browser, {
+                    because "transitive version alignment for consistency across project" +
+                            "\n- org.jetbrains.compose.*:* uses 0.1"
+                    "\n- ${getFullName(libs.ktor.client.core)} uses 0.2"
+                })
+                handler.add(conf.name, libs.kotlinx.atomicfu, {
+                    because "Targets desktop and wasm of compose-ui use different versions"
+                })
             }
         }
     }

diff --git a/solr/compose-ui/build.gradle.kts b/solr/compose-ui/build.gradle.kts
@@ -31,9 +31,9 @@ repositories {
 }
 
 plugins {
-    alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.kotlinSerialization)
-    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.jetbrains.compose)
     alias(libs.plugins.compose.compiler)
 }
 

diff --git a/solr/licenses/annotations-13.0.jar.sha1 b/solr/licenses/annotations-13.0.jar.sha1
diff --git a/solr/licenses/annotations-23.0.0.jar.sha1 b/solr/licenses/annotations-23.0.0.jar.sha1
@@ -0,0 +1 @@
+8cc20c07506ec18e0834947b84a864bfc094484e
diff --git a/solr/licenses/jcl-over-slf4j-2.0.13.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.13.jar.sha1
diff --git a/solr/licenses/jcl-over-slf4j-2.0.16.jar.sha1 b/solr/licenses/jcl-over-slf4j-2.0.16.jar.sha1
@@ -0,0 +1 @@
+9d08badad22f1ac07deac9188ade596472a2bfd9
diff --git a/solr/licenses/jul-to-slf4j-2.0.13.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.13.jar.sha1
diff --git a/solr/licenses/jul-to-slf4j-2.0.16.jar.sha1 b/solr/licenses/jul-to-slf4j-2.0.16.jar.sha1
@@ -0,0 +1 @@
+6d57da3e961daac65bcca0dd3def6cd11e48a24a
diff --git a/solr/licenses/kotlin-stdlib-1.9.10.jar.sha1 b/solr/licenses/kotlin-stdlib-1.9.10.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-2.0.21.jar.sha1 b/solr/licenses/kotlin-stdlib-2.0.21.jar.sha1
@@ -0,0 +1 @@
+618b539767b4899b4660a83006e052b63f1db551
diff --git a/solr/licenses/kotlin-stdlib-common-1.9.10.jar.sha1 b/solr/licenses/kotlin-stdlib-common-1.9.10.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-jdk7-1.9.10.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-1.9.10.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-jdk7-2.0.21.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk7-2.0.21.jar.sha1
@@ -0,0 +1 @@
+222b2be42672d47c002c1b22ac9f030d781fc5db
diff --git a/solr/licenses/kotlin-stdlib-jdk8-1.9.10.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-1.9.10.jar.sha1
diff --git a/solr/licenses/kotlin-stdlib-jdk8-2.0.21.jar.sha1 b/solr/licenses/kotlin-stdlib-jdk8-2.0.21.jar.sha1
@@ -0,0 +1 @@
+72f75cc23f0756dec50b2dcbeb72561501fb8af9
diff --git a/solr/licenses/slf4j-api-2.0.13.jar.sha1 b/solr/licenses/slf4j-api-2.0.13.jar.sha1
diff --git a/solr/licenses/slf4j-api-2.0.16.jar.sha1 b/solr/licenses/slf4j-api-2.0.16.jar.sha1
@@ -0,0 +1 @@
+0172931663a09a1fa515567af5fbef00897d3c04