diff --git a/kotlin-native/endorsedLibraries/build.gradle b/kotlin-native/endorsedLibraries/build.gradle index 35c616e49c6..b2cb1cada0b 100644 --- a/kotlin-native/endorsedLibraries/build.gradle +++ b/kotlin-native/endorsedLibraries/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask import org.jetbrains.kotlin.EndorsedLibraryInfo import org.jetbrains.kotlin.UtilsKt -apply plugin: 'java' +apply plugin: 'konan' buildscript { repositories { diff --git a/kotlin-native/platformLibs/build.gradle b/kotlin-native/platformLibs/build.gradle index 4c5bc3a2810..cb4ff99ce64 100644 --- a/kotlin-native/platformLibs/build.gradle +++ b/kotlin-native/platformLibs/build.gradle @@ -25,7 +25,6 @@ ext.setProperty("org.jetbrains.kotlin.native.home", konanHome) ext.setProperty("konan.jvmArgs", jvmArgs) apply plugin: 'konan' -apply plugin: 'java' //#region Util functions. private ArrayList targetDefFiles(KonanTarget target) { diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt index ed9ff841041..f53fb3ddaff 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt @@ -311,7 +311,7 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR internal const val KONAN_EXTENSION_NAME = "konan" - internal val REQUIRED_GRADLE_VERSION = GradleVersion.version("4.7") + internal val REQUIRED_GRADLE_VERSION = GradleVersion.version("6.7") } private fun Project.cleanKonan() = project.tasks.withType(KonanBuildingTask::class.java).forEach { @@ -330,6 +330,7 @@ class KonanPlugin @Inject constructor(private val registry: ToolingModelBuilderR override fun apply(project: ProjectInternal) { checkGradleVersion() project.plugins.apply("base") + project.plugins.apply("java") // Create necessary tasks and extensions. project.tasks.create(KONAN_DOWNLOAD_TASK_NAME, KonanCompilerDownloadTask::class.java) project.extensions.create(KONAN_EXTENSION_NAME, KonanExtension::class.java)