[KPM] Implement initial kpm/idea dependency resolution

^KT-51386 Verification Pending
This commit is contained in:
sebastian.sellmair
2022-03-07 11:12:22 +01:00
committed by Space
parent 8b84ed4978
commit 1a5fc84080
61 changed files with 2278 additions and 120 deletions
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.external.project
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
fun KotlinPm20ProjectExtension.android() {
fun KotlinPm20ProjectExtension.androidPrototype() {
project.extensions.findByType<AppExtension>()?.applicationVariants?.all { androidVariant ->
main { createKotlinAndroidVariant(androidVariant) }
test { createKotlinAndroidVariant(androidVariant.unitTestVariant ?: return@test) }
@@ -27,4 +27,6 @@ fun KotlinPm20ProjectExtension.android() {
test { createKotlinAndroidVariant(androidVariant.unitTestVariant ?: return@test) }
instrumentedTest { createKotlinAndroidVariant(androidVariant.testVariant ?: return@instrumentedTest) }
}
setupIdeaKotlinFragmentDependencyResolver()
}
@@ -0,0 +1,94 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.android
import com.android.build.gradle.internal.publishing.AndroidArtifacts
import org.gradle.api.attributes.Usage
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.external.external
import org.jetbrains.kotlin.gradle.kpm.external.project
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKotlinDependency.Companion.CLASSPATH_BINARY_TYPE
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKotlinProjectModelBuilder.FragmentConstraint
import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKotlinResolvedBinaryDependencyImpl
import org.jetbrains.kotlin.gradle.kpm.idea.InternalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.kpm.idea.configureIdeaKotlinSpecialPlatformDependencyResolution
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.containingVariants
@OptIn(ExternalVariantApi::class)
val isAndroidFragment = FragmentConstraint { fragment ->
fragment.containingVariants.all { variant -> androidDslKey in variant.external }
}
@OptIn(ExternalVariantApi::class)
val isAndroidAndJvmSharedFragment = FragmentConstraint constraint@{ fragment ->
val variants = fragment.containingVariants
if (variants.any { it.platformType != KotlinPlatformType.jvm }) return@constraint false
variants.any { androidDslKey in it.external } && variants.any { androidDslKey !in it.external }
}
@OptIn(ExternalVariantApi::class, InternalKotlinGradlePluginApi::class)
internal fun KotlinPm20ProjectExtension.setupIdeaKotlinFragmentDependencyResolver() {
configureIdeaKotlinSpecialPlatformDependencyResolution {
/*
Handle android + jvm use cases:
We do not yet support jvm based metadata compilations, therefore we do not
expect any reasonable results coming from metadata resolution.
We default to a 'KotlinPlatformType.jvm' resolution
*/
withConstraint(isAndroidAndJvmSharedFragment) {
withPlatformResolutionAttributes {
namedAttribute(Usage.USAGE_ATTRIBUTE, Usage.JAVA_API)
attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
}
artifactView(CLASSPATH_BINARY_TYPE)
}
withConstraint(isAndroidFragment) {
withPlatformResolutionAttributes {
namedAttribute(Usage.USAGE_ATTRIBUTE, Usage.JAVA_API)
attribute(KotlinPlatformType.attribute, KotlinPlatformType.androidJvm)
}
artifactView(CLASSPATH_BINARY_TYPE) {
attributes {
attribute(AndroidArtifacts.ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.CLASSES_JAR.type)
}
}
artifactView("manifest") {
attributes {
attribute(AndroidArtifacts.ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.MANIFEST.type)
}
}
artifactView("resources") {
attributes {
attribute(AndroidArtifacts.ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.ANDROID_RES.type)
}
}
artifactView("android-symbol") {
attributes {
attribute(AndroidArtifacts.ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.COMPILE_SYMBOL_LIST.type)
}
}
additionalDependencies {
project.getAndroidRuntimeJars().map { androidRuntimeJar ->
IdeaKotlinResolvedBinaryDependencyImpl(
binaryType = CLASSPATH_BINARY_TYPE,
binaryFile = androidRuntimeJar,
coordinates = null
)
}
}
}
}
}
@@ -18,6 +18,7 @@ import org.gradle.kotlin.dsl.named
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
import org.jetbrains.kotlin.gradle.kpm.external.createExternalJvmVariant
import org.jetbrains.kotlin.gradle.kpm.external.external
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
fun KotlinGradleModule.createKotlinAndroidVariant(androidVariant: BaseVariant) {
@@ -45,7 +46,11 @@ fun KotlinGradleModule.createKotlinAndroidVariant(androidVariant: BaseVariant) {
val kotlinVariant = createExternalJvmVariant(
"android${androidVariant.buildType.name.capitalize()}", KotlinJvmVariantConfig(
/* Only swap out configuration that is used. Default setup shall still be applied */
compileDependencies = DefaultKotlinCompileDependenciesDefinition
compileDependencies = (DefaultKotlinCompileDependenciesDefinition +
FragmentAttributes<KotlinGradleFragment> {
namedAttribute(TARGET_JVM_ENVIRONMENT_ATTRIBUTE, TargetJvmEnvironment.ANDROID)
attribute(KotlinPlatformType.attribute, KotlinPlatformType.androidJvm)
})
.withConfigurationProvider { androidVariant.compileConfiguration },
/* Only swap out configuration that is used. Default setup shall still be applied */
@@ -84,4 +89,5 @@ fun KotlinGradleModule.createKotlinAndroidVariant(androidVariant: BaseVariant) {
androidDsl.androidManifest = project.file("AndroidManifest.xml")
androidDsl.compileSdk = 23
androidCommon.external[androidDslKey] = androidDsl
kotlinVariant.external[androidDslKey] = androidDsl
}
@@ -5,11 +5,10 @@
package org.jetbrains.kotlin.gradle.android
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinGradleFragment
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinGradleFragmentInternal
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinGradleModule
val KotlinGradleModule.androidCommon: KotlinGradleFragmentInternal
get() = (fragments.findByName("android") ?: fragments.create("android") { fragment ->
get() = (fragments.findByName("androidCommon") ?: fragments.create("androidCommon") { fragment ->
fragment.refines(common)
}) as KotlinGradleFragmentInternal