Skip to content

Commit

Permalink
Merge pull request #203 from alvasw/fix_broken_gradle_regtest_task
Browse files Browse the repository at this point in the history
Gradle Regtest: Add networkServiceConfig JVM args
  • Loading branch information
chimp1984 committed Apr 4, 2022
2 parents 6051524 + 6d6f531 commit cd7c6ba
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ object ApplicationRunTaskFactory {
taskName = taskName,
descriptionText = description,
cmdLineArgs = cmdLineArgs,
jvmArgs = listOf(
"-Dbisq.networkServiceConfig.seedAddressByTransportType.clear.0=127.0.0.1:8000",
"-Dbisq.networkServiceConfig.seedAddressByTransportType.clear.1=127.0.0.1:8001"
),
dependentTask = dependentTask
)
}
Expand All @@ -42,6 +46,7 @@ object ApplicationRunTaskFactory {
taskName: String,
descriptionText: String,
cmdLineArgs: List<String>,
jvmArgs: List<String>,
dependentTask: TaskProvider<out DefaultTask>?
) {
project.tasks.register<JavaExec>(taskName) {
Expand All @@ -59,7 +64,7 @@ object ApplicationRunTaskFactory {
mainModule.set(javaApplication.mainModule)
mainClass.set(javaApplication.mainClass)

conventionMapping.map("jvmArgs", javaApplication::getApplicationDefaultJvmArgs)
conventionMapping.map("jvmArgs") { javaApplication.applicationDefaultJvmArgs + jvmArgs }

val javaPluginExtension = project.extensions.getByType(JavaPluginExtension::class.java)
modularity.inferModulePath.convention(javaPluginExtension.modularity.inferModulePath)
Expand Down

0 comments on commit cd7c6ba

Please sign in to comment.