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

[Build] Revert workaround introduced in 2f39a656

Browse Source
This commit is contained in:
Alexander Likhachev
2022-04-20 01:43:21 +03:00
committed by Space
parent 41daf39000
commit feccc5785f
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlin.test/js/build.gradle
+1 -3
View File
@@ -56,10 +56,8 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
duplicatesStrategy DuplicatesStrategy.FAIL duplicatesStrategy DuplicatesStrategy.FAIL
// workaround for https://github.com/gradle/gradle/issues/17936
def archiveOperations = services.get(ArchiveOperations) def archiveOperations = services.get(ArchiveOperations)
RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get() from { libraryJarWithoutIr.archiveFile.map { archiveOperations.zipTree(it) } }
from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs") dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
from { from {
libraries/stdlib/js-v1/build.gradle
+1 -3
View File
@@ -276,10 +276,8 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
duplicatesStrategy DuplicatesStrategy.FAIL duplicatesStrategy DuplicatesStrategy.FAIL
// workaround for https://github.com/gradle/gradle/issues/17936
def archiveOperations = services.get(ArchiveOperations) def archiveOperations = services.get(ArchiveOperations)
RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get() from { libraryJarWithoutIr.archiveFile.map {archiveOperations.zipTree(it) } }
from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs") dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
from { from {
def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:compileKotlinJs") def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:compileKotlinJs")
prepare/compiler-embeddable/build.gradle.kts
+2 -6
View File
@@ -57,19 +57,15 @@ val runtimeJar = runtimeJar(embeddableCompiler()) {
sourcesJar { sourcesJar {
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("sourcesJar") val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("sourcesJar")
dependsOn(compilerTask) dependsOn(compilerTask)
// workaround for https://github.com/gradle/gradle/issues/17936
val archiveOperations = serviceOf<ArchiveOperations>() val archiveOperations = serviceOf<ArchiveOperations>()
val sourcesJar by lazy { compilerTask.get().archiveFile.get() } from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
from({ archiveOperations.zipTree(sourcesJar) })
} }
javadocJar { javadocJar {
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("javadocJar") val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("javadocJar")
dependsOn(compilerTask) dependsOn(compilerTask)
// workaround for https://github.com/gradle/gradle/issues/17936
val archiveOperations = serviceOf<ArchiveOperations>() val archiveOperations = serviceOf<ArchiveOperations>()
val javadocJarFile by lazy { compilerTask.get().archiveFile.get() } from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
from({ archiveOperations.zipTree(javadocJarFile) })
} }
projectTest { projectTest {