[Native] Add java plugin dependency to Konan plugin

Change required version of Gradle to 6.7
This commit is contained in:
Pavel Punegov
2021-07-29 13:13:13 +03:00
committed by Space
parent ad2fabb7cb
commit ba5bd0b069
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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 {
-1
View File
@@ -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<DefFile> targetDefFiles(KonanTarget target) {
@@ -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)