diff --git a/modules/dokkatoo-plugin/src/main/kotlin/DokkatooBasePlugin.kt b/modules/dokkatoo-plugin/src/main/kotlin/DokkatooBasePlugin.kt index 4e1b850d..c719c1ed 100644 --- a/modules/dokkatoo-plugin/src/main/kotlin/DokkatooBasePlugin.kt +++ b/modules/dokkatoo-plugin/src/main/kotlin/DokkatooBasePlugin.kt @@ -74,17 +74,7 @@ constructor( target.tasks.withType().configureEach { cacheDirectory.convention(dokkatooExtension.dokkatooCacheDirectory) - workerDebugEnabled.convention(false) workerLogFile.convention(temporaryDir.resolve("dokka-worker.log")) - workerJvmArgs.set( - listOf( - //"-XX:MaxMetaspaceSize=512m", - "-XX:+HeapDumpOnOutOfMemoryError", - "-XX:+AlwaysPreTouch", // https://github.com/gradle/gradle/issues/3093#issuecomment-387259298 - //"-XX:StartFlightRecording=disk=true,name={path.drop(1).map { if (it.isLetterOrDigit()) it else '-' }.joinToString("")},dumponexit=true,duration=30s", - //"-XX:FlightRecorderOptions=repository=$baseDir/jfr,stackdepth=512", - ) - ) dokkaConfigurationJsonFile.convention(temporaryDir.resolve("dokka-configuration.json")) } diff --git a/modules/dokkatoo-plugin/src/main/kotlin/tasks/DokkatooGenerateTask.kt b/modules/dokkatoo-plugin/src/main/kotlin/tasks/DokkatooGenerateTask.kt index 7d5160b3..4f606ab8 100644 --- a/modules/dokkatoo-plugin/src/main/kotlin/tasks/DokkatooGenerateTask.kt +++ b/modules/dokkatoo-plugin/src/main/kotlin/tasks/DokkatooGenerateTask.kt @@ -72,20 +72,6 @@ constructor( @get:Nested val generator: DokkaGeneratorParametersSpec = objects.newInstance(pluginsConfiguration) - /** @see JavaForkOptions.getDebug */ - @get:Input - abstract val workerDebugEnabled: Property - /** @see JavaForkOptions.getMinHeapSize */ - @get:Input - @get:Optional - abstract val workerMinHeapSize: Property - /** @see JavaForkOptions.getMaxHeapSize */ - @get:Input - @get:Optional - abstract val workerMaxHeapSize: Property - /** @see JavaForkOptions.jvmArgs */ - @get:Input - abstract val workerJvmArgs: ListProperty @get:Internal abstract val workerLogFile: RegularFileProperty @@ -110,16 +96,8 @@ constructor( logger.info("DokkaGeneratorWorker runtimeClasspath: ${runtimeClasspath.asPath}") - val workQueue = workers.processIsolation { + val workQueue = workers.classLoaderIsolation { classpath.from(runtimeClasspath) - forkOptions { - defaultCharacterEncoding = "UTF-8" - minHeapSize = workerMinHeapSize.orNull - maxHeapSize = workerMaxHeapSize.orNull - enableAssertions = true - debug = workerDebugEnabled.get() - jvmArgs = workerJvmArgs.get() - } } workQueue.submit(DokkaGeneratorWorker::class) {