@@ -12,8 +12,8 @@ import org.gradle.api.tasks.TaskAction
12
12
import org.gradle.api.tasks.UntrackedTask
13
13
import org.gradle.kotlin.dsl.of
14
14
import org.jetbrains.dokka.gradle.internal.DokkaInternalApi
15
+ import org.jetbrains.dokka.gradle.internal.PluginFeaturesService.Companion.pluginFeaturesService
15
16
import org.jetbrains.dokka.gradle.internal.appendPath
16
- import org.jetbrains.dokka.gradle.tasks.LogHtmlPublicationLinkTask.Companion.ENABLE_TASK_PROPERTY_NAME
17
17
import org.slf4j.LoggerFactory
18
18
import java.net.HttpURLConnection
19
19
import java.net.URI
@@ -28,8 +28,8 @@ import javax.inject.Inject
28
28
* [IntelliJ's built-in server](https://www.jetbrains.com/help/phpstorm/php-built-in-web-server.html#ws_html_preview_output_built_in_browser)†
29
29
* to host the file.
30
30
*
31
- *
32
- * This task can be disabled using the [ENABLE_TASK_PROPERTY_NAME] project property .
31
+ * This task can be disabled via a Gradle property.
32
+ * See [org.jetbrains.dokka.gradle.internal.PluginFeaturesService.enableLogHtmlPublicationLink] .
33
33
*
34
34
* ---
35
35
*
@@ -88,18 +88,9 @@ constructor(
88
88
// to display this task prominently.
89
89
group = " other"
90
90
91
- val serverActive = providers.of(ServerActiveCheck ::class ) {
92
- parameters.uri.convention(serverUri)
93
- }
94
- super .onlyIf(" server URL is reachable" ) { serverActive.get() }
95
-
96
- val logHtmlPublicationLinkTaskEnabled = providers
97
- .gradleProperty(ENABLE_TASK_PROPERTY_NAME )
98
- .map(String ::toBoolean)
99
- .orElse(true )
100
-
101
- super .onlyIf(" task is enabled via property" ) {
102
- logHtmlPublicationLinkTaskEnabled.get()
91
+ val enableLogHtmlPublicationLink = project.pluginFeaturesService.enableLogHtmlPublicationLink
92
+ super .onlyIf(" task is enabled via 'enableLogHtmlPublicationLink' property" ) {
93
+ enableLogHtmlPublicationLink.get()
103
94
}
104
95
105
96
super .onlyIf(" ${::serverUri.name} is present" ) {
@@ -109,6 +100,11 @@ constructor(
109
100
super .onlyIf(" ${::indexHtmlPath.name} is present" ) {
110
101
! indexHtmlPath.orNull.isNullOrBlank()
111
102
}
103
+
104
+ val serverActive = providers.of(ServerActiveCheck ::class ) {
105
+ parameters.uri.convention(serverUri)
106
+ }
107
+ super .onlyIf(" server URL is reachable" ) { serverActive.get() }
112
108
}
113
109
114
110
@TaskAction
@@ -194,24 +190,5 @@ constructor(
194
190
// }
195
191
}
196
192
197
- companion object {
198
- /* *
199
- * Control whether the [LogHtmlPublicationLinkTask] task is enabled. Useful for disabling the
200
- * task locally, or in CI/CD, or for tests.
201
- *
202
- * It can be set in any `gradle.properties` file. For example, on a specific machine:
203
- *
204
- * ```properties
205
- * # $GRADLE_USER_HOME/gradle.properties
206
- * org.jetbrains.dokka.gradle.enabledLogHtmlPublicationLink=false
207
- * ```
208
- *
209
- * or via an environment variable
210
- *
211
- * ```env
212
- * ORG_GRADLE_PROJECT_org.jetbrains.dokka.gradle.enabledLogHtmlPublicationLink=false
213
- * ```
214
- */
215
- const val ENABLE_TASK_PROPERTY_NAME = " org.jetbrains.dokka.gradle.enableLogHtmlPublicationLink"
216
- }
193
+ companion object
217
194
}
0 commit comments