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

Test expected js target resources publication bahavior

Browse Source 
^KT-65540
This commit is contained in:
Timofey Solonin
2024-03-05 17:20:35 +01:00
committed by Space Team
parent b765cf3f99
commit 76814a8bbe
26 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/verification-metadata.xml
+1
View File
@@ -26,6 +26,7 @@
<trust group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlin-dom-api-compat" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
<trust group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1\.9\.3[0-9](-.+)?|2\.0\.0(-.+)?" regex="true"/>
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesConsumptionIT.kt
+1
View File
@@ -74,6 +74,7 @@ class MultiplatformResourcesConsumptionIT : KGPBaseTest() {
"linuxX64",
"wasmJs",
"wasmWasi",
"js",
) + if (HostManager.hostIsMac) listOf("iosArm64") else emptyList()
resolvableTargets.forEach { target ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesDependencyIT.kt
+2
View File
@@ -49,10 +49,12 @@ class MultiplatformResourcesDependencyIT : KGPBaseTest() {
":compileKotlinLinuxX64",
":compileKotlinWasmJs",
":compileKotlinWasmWasi",
":compileKotlinJs",
":project:compileKotlinJvm",
":project:compileKotlinLinuxX64",
":project:compileKotlinWasmJs",
":project:compileKotlinWasmWasi",
":project:compileKotlinJs",
)
if (HostManager.host.family.isAppleFamily) {
assertTasksExecuted(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/resources/MultiplatformResourcesPublicationIT.kt
+17
View File
@@ -129,6 +129,23 @@ class MultiplatformResourcesPublicationIT : KGPBaseTest() {
)
}
@DisplayName("Multiplatform resources publication for js target")
@GradleAndroidTest
fun testJsTargetResourcesPublication(
gradleVersion: GradleVersion,
androidVersion: String,
providedJdk: JdkVersions.ProvidedJdk,
) {
testEmbeddedResources(
gradleVersion,
androidVersion,
providedJdk,
publicationTask = ":publishJsPublicationToMavenRepository",
publishedArchive = "build/repo/test/publication-js/1.0/publication-js-1.0-kotlin_resources.kotlin_resources.zip",
referenceName = "js",
)
}
@DisplayName("Multiplatform resources publication when a previously non-existent source set with resource is added")
@GradleAndroidTest
fun testNativeTargetResourcesPublicationWithNewSourceSet(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/android/projectDependency/build.gradle.kts
+1
View File
@@ -38,6 +38,7 @@ kotlin {
linuxX64(),
wasmJs(),
wasmWasi(),
js(),
).forEach { target ->
val fontsFilter = if (target is KotlinAndroidTarget) listOf("fonts/*") else emptyList()
val relativeResourcePlacement = provider { File("embed/subproject") }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/build.gradle.kts
+1
View File
@@ -22,6 +22,7 @@ kotlin {
iosSimulatorArm64(),
wasmJs(),
wasmWasi(),
js(),
).forEach { target ->
val assemblyTask = publication.resolveResources(target)
tasks.register<Copy>("${target.disambiguationClassifier}ResolveResources") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/dependency/build.gradle.kts
+1
View File
@@ -32,6 +32,7 @@ kotlin {
iosArm64(),
wasmJs(),
wasmWasi(),
js(),
).forEach { target ->
val relativeResourcePlacement = provider { File("embed/${project.name}") }
val sourceSetPathProvider: (KotlinSourceSet) -> (Provider<File>) = { sourceSet ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/dependency/src/jsMain/multiplatformResources/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResources/inCommon
+1
View File
@@ -0,0 +1 @@
inCommon
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResources/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResourcesTransitive/inCommon
+1
View File
@@ -0,0 +1 @@
inCommon
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/projectWithResourcesTransitive/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResources/inCommon
+1
View File
@@ -0,0 +1 @@
inCommon
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResources/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResourcesTransitive/inCommon
+1
View File
@@ -0,0 +1 @@
inCommon
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/consumption/reference/js/embed/publishedWithResourcesTransitive/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/dependency/build.gradle.kts
+1
View File
@@ -32,6 +32,7 @@ kotlin {
linuxX64()
wasmJs()
wasmWasi()
js()
iosArm64()
iosSimulatorArm64()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/build.gradle.kts
+1
View File
@@ -40,6 +40,7 @@ kotlin {
iosSimulatorArm64(),
wasmJs(),
wasmWasi(),
js(),
).forEach { target ->
val fontsFilter = if (target is KotlinAndroidTarget) listOf("fonts/*") else emptyList()
val relativeResourcePlacement = provider { File("embed/${project.name}") }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/js/embed/publication/inCommon
+1
View File
@@ -0,0 +1 @@
inCommon
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/js/embed/publication/inner/innerInCommon
+1
View File
@@ -0,0 +1 @@
innerInCommon
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/js/embed/publication/inner/platformOverride
+1
View File
@@ -0,0 +1 @@
jsOverride
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/reference/js/embed/publication/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/jsMain/multiplatformResources/inner/platformOverride
+1
View File
@@ -0,0 +1 @@
jsOverride
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformResources/publication/src/jsMain/multiplatformResources/onlyInJs
+1
View File
@@ -0,0 +1 @@
onlyInJs
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetVariantResourcesPublicationTests.kt
+3
View File
@@ -38,6 +38,7 @@ class KotlinTargetVariantResourcesPublicationTests {
{ linuxX64() },
{ wasmWasi() },
{ wasmJs() },
{ js() },
)
)
}
@@ -52,6 +53,7 @@ class KotlinTargetVariantResourcesPublicationTests {
{ linuxX64() },
{ wasmWasi() },
{ wasmJs() },
{ js() },
)
)
}
@@ -68,6 +70,7 @@ class KotlinTargetVariantResourcesPublicationTests {
{ linuxX64() },
{ wasmWasi() },
{ wasmJs() },
{ js() },
)
)
}
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetVariantResourcesResolutionTests.kt
+60 -5
View File
@@ -81,10 +81,11 @@ class KotlinTargetVariantResourcesResolutionTests {
}
@Test
fun `test direct dependency - for wasmJs and wasmWasi targets - when using artifact view`() {
fun `test direct dependency - for wasmJs, wasmWasi, js targets - when using artifact view`() {
listOf<TargetProvider>(
{ wasmJs() },
{ wasmWasi() },
{ js() },
).forEach { target ->
testDirectDependencyOnResourcesProducer(
producerTarget = { target() },
@@ -141,6 +142,25 @@ class KotlinTargetVariantResourcesResolutionTests {
)
}
@Test
fun `test direct dependency - for js - when using resources configuration`() {
testDirectDependencyOnResourcesProducer(
producerTarget = { js() },
consumerTarget = { js() },
resolutionStrategy = KotlinTargetResourcesResolutionStrategy.ResourcesConfiguration,
filterResolvedFiles = {
it.filterNot {
it.path.contains("kotlin-stdlib-js") || it.path.contains("kotlin-dom-api-compat")
}.toSet()
},
expectedResult = { _, producer ->
hashSetOf(
producer.buildFile("kotlin-multiplatform-resources/zip-for-publication/js/producer.kotlin_resources.zip"),
)
},
)
}
@Test
fun `test transitive dependency - without resources in middle project - with configuration`() {
testTransitiveDependencyOnResourcesProducer(
@@ -198,6 +218,44 @@ class KotlinTargetVariantResourcesResolutionTests {
}
}
@Test
fun `test transitive dependency - without resources in middle project in js - with configuration`() {
dependencyScopesWithResources().forEach { dependencyScope ->
testTransitiveDependencyOnResourcesProducer(
targetProvider = { js() },
resolutionStrategy = KotlinTargetResourcesResolutionStrategy.VariantReselection,
dependencyScope = dependencyScope,
filterResolvedFiles = {
it.filterNot {
it.path.contains("kotlin-stdlib-js") || it.path.contains("kotlin-dom-api-compat")
}.toSet()
},
expectedResult = { _, _, producer ->
setOf(
producer.buildFile("kotlin-multiplatform-resources/zip-for-publication/js/producer.kotlin_resources.zip"),
)
}
)
}
}
@Test
fun `test transitive dependency - without resources in middle project in js - with artifact view`() {
dependencyScopesWithResources().forEach { dependencyScope ->
testTransitiveDependencyOnResourcesProducer(
targetProvider = { js() },
resolutionStrategy = KotlinTargetResourcesResolutionStrategy.VariantReselection,
dependencyScope = dependencyScope,
filterResolvedFiles = { it },
expectedResult = { _, _, producer ->
setOf(
producer.buildFile("kotlin-multiplatform-resources/zip-for-publication/js/producer.kotlin_resources.zip"),
)
}
)
}
}
@Test
fun `test transitive dependency - without resources in middle project - with artifact view`() {
testTransitiveDependencyOnResourcesProducer(
@@ -280,6 +338,7 @@ class KotlinTargetVariantResourcesResolutionTests {
val targetsToTest = listOf<TargetProvider>(
{ wasmJs() },
{ wasmWasi() },
{ js() },
{ linuxX64() },
{ iosArm64() },
)
@@ -304,9 +363,6 @@ class KotlinTargetVariantResourcesResolutionTests {
return listOf(
{ this::implementation },
{ this::api },
// What are these supposed to mean for resources?
// { this::compileOnly }, ?
// { this::runtimeOnly }, ?
)
}
@@ -537,7 +593,6 @@ class KotlinTargetVariantResourcesResolutionTests {
projectBuilder = projectBuilder,
preApplyCode = preApplyCode,
) {
enableDependencyVerification(false)
enableDefaultStdlibDependency(true)
repositories.mavenLocal()
repositories.mavenCentralCacheRedirector()