…ser matching usage in gradle.kts files)

…_plugin

…' into feat/gradle_dokka_executor_service

…ec {}

…sl_plugin

…o_task_package

…y_by_setter

…enerator in an isolated process

…orker_daemon

…sl_plugin

…Coroutines_in_gradle

…dle_dokka_worker_daemon

…tests

…dle_dokka_worker_daemon

…dle_dokka_worker_daemon

…ains/qodana-clone-finder:2021.1-eap' locally)

…ains/qodana-clone-finder:2021.1-eap' locally)

…dle_dokka_worker_daemon

…mon' into feat/gradle_dokka_worker_daemon

…sl_plugin

…' into feat/move_tasks_into_task_package

…ckage' into feat/remove_property_by_setter

# Conflicts:
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt

…orker_daemon

# Conflicts:
#	core/api/core.api
#	core/src/main/kotlin/DokkaBootstrapImpl.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt

…rker_daemon

…and safeConvention() with convention()

…' into feat/expose_finalizeCoroutines_in_gradle

# Conflicts:
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt

…es_in_gradle' into feat/gradle_dokka_worker_daemon

# Conflicts:
#	.github/workflows/qodana.yml

…y_by_setter-original

# Conflicts:
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt

…sl_plugin

# Conflicts:
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTaskTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaTaskTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt

…_task_package

# Conflicts:
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt

…le_dokka_worker_daemon

# Conflicts:
#	core/src/main/kotlin/DokkaBootstrapImpl.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt

…te_gradle_utils_with_kotlin_dsl

…dle_utils_with_kotlin_dsl

# Conflicts:
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt

…h_kotlin_dsl' into feat/gradle_dokka_worker_daemon

# Conflicts:
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt
#	runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt

# Conflicts:
#	runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTaskTest.kt