Update dependencies

hexagontk · Jun 1, 2024 · 0426ed1 · 0426ed1
1 parent a2a448b
commit 0426ed1
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,15 +18,15 @@ import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
  */
 
 plugins {
-    kotlin("jvm") version("2.0.0") apply(false)
+    kotlin("jvm") version(libs.versions.kotlin) apply(false)
 
     id("idea")
     id("eclipse")
     id("project-report")
-    id("org.jetbrains.dokka") version("1.9.20")
-    id("com.github.jk1.dependency-license-report") version("2.8")
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version("0.15.0-Beta.2")
-    id("org.graalvm.buildtools.native") version("0.10.2") apply(false)
+    id("org.jetbrains.dokka") version(libs.versions.dokka)
+    id("com.github.jk1.dependency-license-report") version(libs.versions.licenseReport)
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version(libs.versions.binValidator)
+    id("org.graalvm.buildtools.native") version(libs.versions.nativeTools) apply(false)
     id("io.gitlab.arturbosch.detekt") version("1.23.6") apply(false)
     id("me.champeau.jmh") version("0.7.2") apply(false)
 }
@@ -140,7 +140,7 @@ gradle.taskGraph.whenReady(closureOf<TaskExecutionGraph> {
 })
 
 tasks.wrapper {
-    gradleVersion = "8.7"
+    gradleVersion = "8.8"
     distributionType = ALL
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,6 @@
 # suppress inspection "UnusedProperty" for whole file
 
+# TODO Check `hexagonal_starter` to see how to get rid of this file
 org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8
 org.gradle.warning.mode=all
 org.gradle.console=plain
@@ -37,7 +38,7 @@ mavenVersion=3.9.7
 mockkVersion=1.13.11
 junitVersion=5.10.2
 # TODO Latest version breaks stress test
-#gatlingVersion=3.11.2
+#gatlingVersion=3.11.3
 gatlingVersion=3.10.5
 slf4jVersion=2.0.13
 jmhVersion=1.37

diff --git a/gradle/native.gradle b/gradle/native.gradle
@@ -20,10 +20,22 @@ graalvmNative {
     }
 
     binaries {
+        // Save some processors to avoid hangs on low end hardware
+        int processors = Runtime.getRuntime().availableProcessors()
+        int parallelism = processors > 4 ? processors - 2 : processors - 1
+
+        main {
+            buildArgs.add("--parallelism=" + parallelism)
+        }
+
         test {
             quickBuild = true
-            runtimeArgs = [ "--xml-output-dir", "build/reports/tests/native" ]
-            jvmArgs = [ "-Xmx6g" ]
+            runtimeArgs.addAll([
+                "--xml-output-dir",
+                "build/reports/tests/native",
+            ])
+            jvmArgs.add("-Xmx6g")
+            buildArgs.add("--parallelism=" + parallelism)
         }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,6 +15,69 @@ includeNestedModules(
     "templates"
 )
 
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            // Build
+            version("kotlin", "2.0.0")
+            version("dokka", "1.9.20")
+            version("licenseReport", "2.8")
+            version("binValidator", "0.15.0-Beta.2")
+            version("nativeTools", "0.10.2")
+
+            // Tooling
+            version("mkdocsMaterial", "9.5.25")
+            version("mermaidDokka", "0.6.0")
+            version("maven", "3.9.7")
+
+            // Testing
+            version("junit", "5.10.2")
+            version("mockk", "1.13.11")
+            // TODO Latest version breaks stress test
+            //version("gatling", "3.11.3")
+            version("gatling", "3.10.5")
+            version("jmh", "1.37")
+
+            // Shared
+            version("slf4j", "2.0.13")
+
+            // http_server_netty
+            version("netty", "4.1.110.Final")
+            version("nettyTcNative", "2.0.65.Final")
+
+            // http_server_helidon
+            version("helidon", "4.0.9")
+
+            // http_server_servlet
+            version("servlet", "6.0.0")
+            version("jetty", "12.0.9")
+
+            // rest_tools
+            version("swaggerRequestValidator", "2.40.0")
+
+            // serialization
+            version("jackson", "2.17.1")
+            version("dslJson", "2.0.2")
+
+            // serverless_http_google
+            version("functions", "1.1.0")
+            version("invoker", "1.3.1")
+
+            // templates_freemarker
+            version("freemarker", "2.3.32")
+
+            // templates_jte
+            version("jte", "3.1.12")
+
+            // templates_pebble
+            version("pebble", "3.2.2")
+
+            // templates_rocker
+            version("rocker", "1.4.0")
+        }
+    }
+}
+
 fun includeNestedModules(vararg directories: String) {
     directories.forEach(::includeNestedModules)
 }