azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix friendArtifactResolver for External Targets API

Browse Source 
It was failing with ClassCastException in an attempt of using it.

Also added a test case to cover the logic with friendArtifactResolver

^KT-66431 Verification Pending
This commit is contained in:
Anton Lakotka
2024-03-08 14:45:43 +01:00
committed by Space Team
parent 5873127342
commit e2336e1752
4 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/createExternalKotlinCompilation.kt
Vendored
+1 -1
View File
@@ -61,7 +61,7 @@ fun <T : DecoratedExternalKotlinCompilation> DecoratedExternalKotlinTarget.creat
descriptor.friendArtifactResolver?.let { declaredResolver ->
DefaultKotlinCompilationFriendPathsResolver.FriendArtifactResolver { compilation ->
@Suppress("unchecked_cast")
declaredResolver.resolveFriendPaths(compilation as T)
declaredResolver.resolveFriendPaths(compilation.decoratedInstance as T)
}
}
)
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/ExternalAndroidTargetPrototypeSmokeTest.kt
+46
View File
@@ -16,9 +16,12 @@ import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.anyDependency
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerArgumentsProducer.CreateCompilerArgumentsContext.Companion.default
import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.util.*
import org.jetbrains.kotlin.gradle.utils.getByType
import org.jetbrains.kotlin.util.assertDoesNotThrow
import org.junit.Test
import kotlin.test.BeforeTest
import kotlin.test.assertEquals
@@ -96,4 +99,47 @@ class ExternalAndroidTargetPrototypeSmokeTest {
anyDependency()
)
}
@Test
fun `test compile task arguments created without failures`() {
val project = buildProject {
enableDefaultStdlibDependency(false)
enableDependencyVerification(false)
applyMultiplatformPlugin()
repositories.mavenLocal()
repositories.mavenCentralCacheRedirector()
}
setAndroidSdkDirProperty(project)
project.androidLibrary { compileSdk = 31 }
val androidTargetPrototype = project.multiplatformExtension.androidTargetPrototype()
project.evaluate()
androidTargetPrototype.compilations.forEach { compilation ->
val compileTask = compilation.compileTaskProvider.get() as KotlinCompile
assertDoesNotThrow { compileTask.createCompilerArguments(default) }
}
}
@Test
fun `test extra friend-path is added correctly to compiler args`() {
val project = buildProject {
enableDefaultStdlibDependency(false)
enableDependencyVerification(false)
applyMultiplatformPlugin()
repositories.mavenLocal()
repositories.mavenCentralCacheRedirector()
}
setAndroidSdkDirProperty(project)
project.androidLibrary { compileSdk = 31 }
val androidTargetPrototype = project.multiplatformExtension.androidTargetPrototype()
project.evaluate()
val unitTest = androidTargetPrototype.compilations.getByName("unitTest")
val file = project.file("foo.jar")
unitTest.extraFriendPaths.from(file)
val compileTask = unitTest.compileTaskProvider.get() as KotlinCompile
val args = compileTask.createCompilerArguments(default)
if (file.absolutePath !in args.friendPaths!!) fail("File $file was not found int the friend paths ${args.friendPaths!!.toList()}")
}
}