chore: native build fixes & dep updates

sureshg · Jul 21, 2024 · 673390a · 673390a
1 parent c0d780b
commit 673390a
Show file tree

Hide file tree

Showing 9 changed files with 340 additions and 506 deletions.
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/graalvm.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/graalvm.gradle.kts
@@ -113,12 +113,12 @@ graalvmNative {
         // https://www.graalvm.org/dashboard/?ojr=help%3Btopic%3Dgetting-started.md
       }
 
-      resources {
-        autodetection {
-          enabled = true
-          restrictToProjectDependencies = true
-        }
-      }
+      // resources {
+      //   autodetection {
+      //     enabled = true
+      //     restrictToProjectDependencies = true
+      //   }
+      // }
 
       jvmArgs = listOf("--add-modules=$addModules")
       systemProperties = mapOf("java.awt.headless" to "false")
@@ -132,7 +132,7 @@ graalvmNative {
     metadataCopy {
       inputTaskNames.add("run") // Tasks previously executed with the agent attached (test).
       outputDirectories.add("src/main/resources/META-INF/native-image")
-      mergeWithExisting = true
+      mergeWithExisting = false
     }
   }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ publish-org-url                = "https://suresh.dev"
 publish-scm-url                = "https://github.com/sureshg/native-image-playground"
 
 # Gradle Dependencies Versions
-kotlinx-kover                  = "0.8.2"
+kotlinx-kover                  = "0.8.3"
 kotlinx-io                     = "0.4.0"
 kotlinx-atomicfu               = "0.25.0"
 kotlinx-coroutines             = "1.9.0-RC"
@@ -36,7 +36,7 @@ ajalt-clikt                    = "4.4.0"
 ajalt-mordant                  = "2.7.1"
 ajalt-colormath                = "3.6.0"
 dokka                          = "1.9.20"
-helidon                        = "4.0.10"
+helidon                        = "4.0.11"
 jgit                           = "6.10.0.202406032230-r"
 jte                            = "3.1.12"
 junit                          = "5.11.0-M2"

diff --git a/src/main/resources/META-INF/native-image/jni-config.json b/src/main/resources/META-INF/native-image/jni-config.json
diff --git a/src/main/resources/META-INF/native-image/predefined-classes-config.json b/src/main/resources/META-INF/native-image/predefined-classes-config.json
diff --git a/src/main/resources/META-INF/native-image/proxy-config.json b/src/main/resources/META-INF/native-image/proxy-config.json