Skip to content

Commit a2730f2

Browse files
demiurg906Space Team
authored andcommitted
[Build] Support publication of testFixture sources in jars for ide
<co-authored by Alexander Likhachev>
1 parent 2e72b6a commit a2730f2

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoArtifacts.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import org.gradle.api.Project
66
import org.gradle.api.Task
77
import org.gradle.api.artifacts.ConfigurablePublishArtifact
88
import org.gradle.api.artifacts.Configuration
9-
import org.gradle.api.artifacts.ConfigurationContainer
109
import org.gradle.api.artifacts.ModuleDependency
1110
import org.gradle.api.artifacts.PublishArtifact
1211
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
@@ -19,19 +18,17 @@ import org.gradle.api.plugins.JavaPlugin
1918
import org.gradle.api.plugins.JavaPlugin.JAVADOC_ELEMENTS_CONFIGURATION_NAME
2019
import org.gradle.api.plugins.JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME
2120
import org.gradle.api.plugins.JavaPluginExtension
22-
import org.gradle.api.provider.Provider
2321
import org.gradle.api.publish.PublishingExtension
2422
import org.gradle.api.publish.maven.MavenPublication
2523
import org.gradle.api.publish.tasks.GenerateModuleMetadata
2624
import org.gradle.api.tasks.TaskProvider
2725
import org.gradle.api.tasks.javadoc.Javadoc
26+
import org.gradle.internal.component.external.model.TestFixturesSupport
2827
import org.gradle.jvm.tasks.Jar
2928
import org.gradle.kotlin.dsl.*
3029
import org.gradle.kotlin.dsl.support.serviceOf
31-
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetContainer
3230
import plugins.KotlinBuildPublishingPlugin
3331
import plugins.mainPublicationName
34-
import java.io.File
3532

3633

3734
private const val MAGIC_DO_NOT_CHANGE_TEST_JAR_TASK_NAME = "testJar"
@@ -456,8 +453,17 @@ private fun Project.publishTestJar(
456453
}
457454

458455
sourcesJar {
456+
fun registerTestSources(projectNames: List<String>) {
457+
from {
458+
projectNames.map { project(it).testSourceSet.allSource }
459+
}
460+
}
461+
462+
registerTestSources(projects)
463+
registerTestSources(projectWithRenamedTestJarNames)
464+
459465
from {
460-
projects.map { project(it).testSourceSet.allSource }
466+
projectWithFixturesNames.map { project(it).sourceSets.getByName(TestFixturesSupport.TEST_FIXTURE_SOURCESET_NAME).allSource }
461467
}
462468
}
463469

0 commit comments

Comments
 (0)