From 4e6c483ccc35ea665014b59c5cf0d132dee152c4 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Thu, 22 Apr 2021 22:01:15 +0300 Subject: [PATCH] Add a `final override` for `project` in `KotlinGradleFragmentInternal` --- .../kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt | 7 +++++-- .../kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt index 2eb4b4a2a0a..6f2a3fe5a97 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp.pm20 import groovy.lang.Closure import org.gradle.api.NamedDomainObjectProvider +import org.gradle.api.Project import org.gradle.api.file.SourceDirectorySet import org.gradle.api.provider.Provider import org.gradle.util.ConfigureUtil @@ -30,6 +31,9 @@ open class KotlinGradleFragmentInternal @Inject constructor( override fun getName(): String = fragmentName + final override val project: Project // overriding with final to avoid warnings + get() = super.project + // TODO pull up to KotlinModuleFragment // FIXME apply to compilation // FIXME check for consistency @@ -85,11 +89,10 @@ open class KotlinGradleFragmentInternal @Inject constructor( override val declaredModuleDependencies: Iterable get() = project.configurations.getByName(apiConfigurationName).allDependencies.map { it.toModuleDependency(project) } // FIXME impl - override val kotlinSourceRoots: SourceDirectorySet by lazy { + override val kotlinSourceRoots: SourceDirectorySet = project.objects.sourceDirectorySet( "$fragmentName.kotlin", "Kotlin sources for fragment $fragmentName" ) - } override val transitiveApiConfigurationName: String get() = disambiguateName("transitiveApi") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt index 203df9fbc1b..a17f2c8c5b4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/abstractVariants.kt @@ -27,9 +27,6 @@ abstract class KotlinGradleVariantInternal( override val fragmentName: String ) : KotlinGradleFragmentInternal(containingModule, fragmentName), KotlinGradleVariant { - final override val project: Project // overriding with final to avoid warnings - get() = super.project - override val variantAttributes: Map get() = mapOf(KotlinPlatformTypeAttribute to kotlinPlatformTypeAttributeFromPlatform(platformType)) // TODO user attributes