Merge pull request #615 from hexagonkt/develop

Infrastructure fixes
hexagontk · Apr 10, 2023 · b77cefe · b77cefe
2 parents c39f143 + 3fb9bb6
commit b77cefe
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 49 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ import io.gitlab.arturbosch.detekt.Detekt
  */
 
 plugins {
-    kotlin("jvm") version("1.8.10") apply(false)
+    kotlin("jvm") version("1.8.20") apply(false)
 
     id("idea")
     id("eclipse")

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.warning.mode=all
 org.gradle.console=plain
 
 # Gradle
-version=2.6.7
+version=2.6.8
 group=com.hexagonkt
 description=The atoms of your platform
 
@@ -33,13 +33,13 @@ logoLarge=assets/img/logo.svg
 iconsDirectory=content
 
 # VERSIONS
-kotlinVersion=1.8.10
+kotlinVersion=1.8.20
 dokkaVersion=1.8.10
 mockkVersion=1.13.4
 junitVersion=5.9.2
-gatlingVersion=3.9.2
+gatlingVersion=3.9.3
 jmhVersion=1.36
-mkdocsMaterialVersion=9.1.5
+mkdocsMaterialVersion=9.1.6
 mermaidDokkaVersion=0.4.4
 nativeToolsVersion=0.9.20
 
@@ -48,7 +48,7 @@ servletVersion=5.0.0
 jettyVersion=11.0.14
 
 # http_server_netty
-nettyVersion=4.1.90.Final
+nettyVersion=4.1.91.Final
 
 # logging
 slf4jVersion=2.0.7

diff --git a/gradle/icons.gradle b/gradle/icons.gradle
@@ -18,12 +18,7 @@ task("icons").doLast {
     createPng(logoLarge, "$iconsDirectory/icon-large.png", 512, 512)
 }
 
-private void createPng(
-    final String svg,
-    final String out,
-    final int width,
-    final int height
-) {
+private void createPng(final String svg, final String out, final int width, final int height) {
 
     exec {
         final String geometry = "${width}x${height}"
@@ -41,19 +36,3 @@ private void createPng(
         )
     }
 }
-
-private List<Integer> getSvgDimensions(final String svg) {
-
-    final ByteArrayOutputStream commandOutput = new ByteArrayOutputStream()
-    exec {
-        standardOutput = commandOutput
-        commandLine("identify", svg)
-    }
-
-    return commandOutput
-        .toString()
-        .find(/\s+\d+x\d+\s+/)
-        .trim()
-        .split("x")
-        .collect {it.toInteger() }
-}
diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -138,7 +138,7 @@ tasks.withType(Test) { testTask ->
 }
 
 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.9"
 }
 
 tasks.jacocoTestReport {

diff --git a/site/assets/favicon.png b/site/assets/favicon.png
diff --git a/site/assets/icon-large.png b/site/assets/icon-large.png
diff --git a/site/assets/icon-small.png b/site/assets/icon-small.png
diff --git a/starters/kotlin_pom.xml b/starters/kotlin_pom.xml
@@ -75,7 +75,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.0</version>
           <configuration>
             <filesets>
               <fileset>
@@ -99,13 +99,13 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.0.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.5.0</version>
           <configuration>
             <archive>
               <manifest>
@@ -130,7 +130,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.4</version>
+          <version>3.4.1</version>
           <executions>
             <execution>
               <phase>package</phase>
@@ -157,7 +157,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.8</version>
+          <version>0.8.9</version>
           <executions>
             <execution>
               <goals>
@@ -233,22 +233,9 @@
             </execution>
           </executions>
           <configuration>
-            <skipNativeTests>true</skipNativeTests>
             <metadataRepository>
               <enabled>true</enabled>
             </metadataRepository>
-            <agent>
-              <enabled>true</enabled>
-            </agent>
-            <configFiles>
-              <configFile>${project.build.directory}/native/agent-output/test</configFile>
-            </configFiles>
-            <buildArgs>
-              <buildArg>--enable-http</buildArg>
-              <buildArg>--enable-https</buildArg>
-              <buildArg>--enable-url-protocols=classpath</buildArg>
-              <buildArg>--initialize-at-build-time=com.hexagonkt.core.ClasspathHandler</buildArg>
-            </buildArgs>
           </configuration>
         </plugin>
 
@@ -258,7 +245,6 @@
           <executions>
             <execution>
               <id>build_properties</id>
-              <phase>compile</phase>
               <configuration>
                 <target>
                   <propertyfile file="${project.build.outputDirectory}/META-INF/build.properties">
@@ -275,7 +261,6 @@
               </goals>
             </execution>
             <execution>
-              <phase>package</phase>
               <goals>
                 <goal>run</goal>
               </goals>