From f80456dd46cac8b1ba8ba618787b86a586f26bfe Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 25 Mar 2021 09:56:58 +0300 Subject: [PATCH] Refactor: move AbstractComposeDesktopTask --- .../application/tasks/AbstractCheckNativeDistributionRuntime.kt | 1 + .../desktop/application/tasks/AbstractJvmToolOperationTask.kt | 1 + .../desktop/application/tasks/AbstractNotarizationTask.kt | 1 + .../desktop/application/tasks/AbstractRunDistributableTask.kt | 1 + .../desktop/application/tasks/AbstractSuggestModulesTask.kt | 1 + .../{application => }/tasks/AbstractComposeDesktopTask.kt | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) rename gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/{application => }/tasks/AbstractComposeDesktopTask.kt (98%) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNativeDistributionRuntime.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNativeDistributionRuntime.kt index 67778d765c..000c1e5a47 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNativeDistributionRuntime.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNativeDistributionRuntime.kt @@ -14,6 +14,7 @@ import org.jetbrains.compose.desktop.application.internal.JavaRuntimeProperties import org.jetbrains.compose.desktop.application.internal.executableName import org.jetbrains.compose.desktop.application.internal.ioFile import org.jetbrains.compose.desktop.application.internal.notNullProperty +import org.jetbrains.compose.desktop.tasks.AbstractComposeDesktopTask import java.io.File // __COMPOSE_NATIVE_DISTRIBUTIONS_MIN_JAVA_VERSION__ diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJvmToolOperationTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJvmToolOperationTask.kt index 1f130e6746..4903471349 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJvmToolOperationTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJvmToolOperationTask.kt @@ -17,6 +17,7 @@ import org.jetbrains.compose.desktop.application.internal.ComposeProperties import org.jetbrains.compose.desktop.application.internal.jvmToolFile import org.jetbrains.compose.desktop.application.internal.ioFile import org.jetbrains.compose.desktop.application.internal.notNullProperty +import org.jetbrains.compose.desktop.tasks.AbstractComposeDesktopTask import java.io.File abstract class AbstractJvmToolOperationTask(private val toolName: String) : AbstractComposeDesktopTask() { diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt index ad78c1712a..d6b3c67362 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt @@ -12,6 +12,7 @@ import org.gradle.api.tasks.Optional import org.jetbrains.compose.desktop.application.dsl.MacOSNotarizationSettings import org.jetbrains.compose.desktop.application.internal.nullableProperty import org.jetbrains.compose.desktop.application.internal.validation.validate +import org.jetbrains.compose.desktop.tasks.AbstractComposeDesktopTask abstract class AbstractNotarizationTask : AbstractComposeDesktopTask() { @get:Input diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractRunDistributableTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractRunDistributableTask.kt index 4c3ebc8877..4322d97b9e 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractRunDistributableTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractRunDistributableTask.kt @@ -15,6 +15,7 @@ import org.jetbrains.compose.desktop.application.internal.OS import org.jetbrains.compose.desktop.application.internal.currentOS import org.jetbrains.compose.desktop.application.internal.executableName import org.jetbrains.compose.desktop.application.internal.ioFile +import org.jetbrains.compose.desktop.tasks.AbstractComposeDesktopTask import javax.inject.Inject // Custom task is used instead of Exec, because Exec does not support diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractSuggestModulesTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractSuggestModulesTask.kt index d7fd65aba5..e745b30456 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractSuggestModulesTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractSuggestModulesTask.kt @@ -16,6 +16,7 @@ import org.jetbrains.compose.desktop.application.dsl.DEFAULT_RUNTIME_MODULES import org.jetbrains.compose.desktop.application.internal.* import org.jetbrains.compose.desktop.application.internal.ComposeProperties import org.jetbrains.compose.desktop.application.internal.normalizedPath +import org.jetbrains.compose.desktop.tasks.AbstractComposeDesktopTask import org.jetbrains.kotlin.konan.file.File abstract class AbstractSuggestModulesTask : AbstractComposeDesktopTask() { diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractComposeDesktopTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/tasks/AbstractComposeDesktopTask.kt similarity index 98% rename from gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractComposeDesktopTask.kt rename to gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/tasks/AbstractComposeDesktopTask.kt index 06b191c553..ea9af5bb96 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractComposeDesktopTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/tasks/AbstractComposeDesktopTask.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. */ -package org.jetbrains.compose.desktop.application.tasks +package org.jetbrains.compose.desktop.tasks import org.gradle.api.DefaultTask import org.gradle.api.file.Directory