Tiny fix

parttimenerd · Dec 3, 2023 · e30e060 · e30e060
1 parent 7d72d3f
commit e30e060
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -95,7 +95,7 @@ dependencies {
     implementation("me.bechberger:jfrtofp-server:0.0.2-SNAPSHOT") {
         isChanging = true
     }
-    implementation("me.bechberger:jfrtofp:0.0.2-SNAPSHOT") {
+    implementation("me.bechberger:jfrtofp:0.0.3-SNAPSHOT") {
         isChanging = true
     }
     implementation("me.bechberger:ap-loader-all:2.9-7")

diff --git a/src/main/kotlin/me/bechberger/jfrplugin/runner/BasePluginRunConfigurationExtension.kt b/src/main/kotlin/me/bechberger/jfrplugin/runner/BasePluginRunConfigurationExtension.kt
@@ -18,14 +18,22 @@ import org.jdom.Element
 abstract class BasePluginRunConfigurationExtension(private val name: String, private val executorId: String) :
     RunConfigurationExtension() {
 
+    private fun mergeConfs(conf1: Map<String, String>, conf2: Map<String, String>): Map<String, String> {
+        val mergedConfs = conf1.toMutableMap()
+        conf2.forEach { (key, value) ->
+            if (mergedConfs[key] == null) {
+                mergedConfs[key] = value
+            }
+        }
+        return mergedConfs
+    }
+
     private fun mavenConfs(project: Project): Map<String, String> {
-        val mavenConfs = project.additionalMavenTargets
-        return mavenConfs.ifEmpty { defaultMavenConfs }
+        return mergeConfs(project.additionalMavenTargets, defaultMavenConfs)
     }
 
     private fun gradleConfs(project: Project): Map<String, String> {
-        val gradleConfs = project.additionalGradleTargets
-        return gradleConfs.ifEmpty { defaultGradleConfs }
+        return mergeConfs(project.additionalGradleTargets, defaultGradleConfs)
     }
 
     override fun readExternal(configuration: RunConfigurationBase<*>, element: Element) = Unit