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

[Gradle] NativeExternalDependenciesIT: Build dependencies file at execution time

Browse Source 
^KT-34662 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-03-13 13:13:32 +01:00
committed by Space Team
parent 4264e49970
commit 9517667081
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeExternalDependenciesIT.kt
+2 -3
View File
@@ -99,11 +99,10 @@ class NativeExternalDependenciesIT : BaseGradleIT() {
) )
build( build(
"assemble", "buildExternalDependenciesFile"
options = defaultBuildOptions().copy(dryRun = true)
) { ) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":buildExternalDependenciesFile")
val kotlinNativeTargetName = findKotlinNativeTargetName(output) val kotlinNativeTargetName = findKotlinNativeTargetName(output)
assertNotNull(kotlinNativeTargetName) assertNotNull(kotlinNativeTargetName)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-external-dependencies/build.gradle.kts
+11 -7
View File
@@ -17,12 +17,16 @@ kotlin {
} }
} }
afterEvaluate { val buildExternalDependenciesFile = tasks.register("buildExternalDependenciesFile") {
val externalDependenciesFile = Class.forName("org.jetbrains.kotlin.gradle.tasks.ExternalDependenciesBuilder") doLast {
.getDeclaredMethod("buildExternalDependenciesFileForTests", Project::class.java).apply { isAccessible = true } val externalDependenciesFile = Class.forName("org.jetbrains.kotlin.gradle.tasks.ExternalDependenciesBuilder")
.invoke(null, project) .getDeclaredMethod("buildExternalDependenciesFileForTests", Project::class.java).apply { isAccessible = true }
?.toString().orEmpty() .invoke(null, project)
?.toString().orEmpty()
println("for_test_kotlin_native_target=<SingleNativeTarget>") println("for_test_kotlin_native_target=<SingleNativeTarget>")
println("for_test_external_dependencies_file=$externalDependenciesFile") println("for_test_external_dependencies_file=$externalDependenciesFile")
}
} }
tasks.getByName("assemble").dependsOn(buildExternalDependenciesFile)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/AbstractKotlinSourceSet.kt
+1 -1
View File
@@ -34,7 +34,7 @@ abstract class AbstractKotlinSourceSet : InternalKotlinSourceSet {
final override fun dependsOn(other: KotlinSourceSet) { final override fun dependsOn(other: KotlinSourceSet) {
if (other == this) return if (other == this) return
assert(project.kotlinPluginLifecycle.stage <= KotlinPluginLifecycle.Stage.FinaliseRefinesEdges) { check(project.kotlinPluginLifecycle.stage <= KotlinPluginLifecycle.Stage.FinaliseRefinesEdges) {
"Illegal 'dependsOn' call in stage '${project.kotlinPluginLifecycle.stage}'" "Illegal 'dependsOn' call in stage '${project.kotlinPluginLifecycle.stage}'"
} }