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

[Build] Add workarounds for https://github.com/gradle/gradle/issues/17936

Browse Source 
#KT-44611 In Progress
This commit is contained in:
Alexander Likhachev
2022-02-21 18:36:39 +03:00
parent 44e92a6134
commit 2f39a65679
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/kotlin.test/js/build.gradle
+4 -1
View File
@@ -56,7 +56,10 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
duplicatesStrategy DuplicatesStrategy.FAIL
from zipTree(libraryJarWithoutIr.archiveFile)
// workaround for https://github.com/gradle/gradle/issues/17936
def archiveOperations = services.get(ArchiveOperations)
RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get()
from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
from {
libraries/stdlib/js-v1/build.gradle
+4 -1
View File
@@ -276,7 +276,10 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) {
duplicatesStrategy DuplicatesStrategy.FAIL
from zipTree(libraryJarWithoutIr.archiveFile)
// workaround for https://github.com/gradle/gradle/issues/17936
def archiveOperations = services.get(ArchiveOperations)
RegularFile libraryJarWithoutIrFile = libraryJarWithoutIr.archiveFile.get()
from { archiveOperations.zipTree(libraryJarWithoutIrFile) }
dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs")
from {
def irKlib = tasks.getByPath(":kotlin-stdlib-js-ir:compileKotlinJs")
prepare/compiler-embeddable/build.gradle.kts
+9 -2
View File
@@ -1,6 +1,7 @@
import java.util.stream.Collectors
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
import org.gradle.kotlin.dsl.support.serviceOf
import shadow.org.apache.tools.zip.ZipEntry
import shadow.org.apache.tools.zip.ZipOutputStream
@@ -56,13 +57,19 @@ val runtimeJar = runtimeJar(embeddableCompiler()) {
sourcesJar {
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("sourcesJar")
dependsOn(compilerTask)
from(compilerTask.map { zipTree(it.archiveFile) })
// workaround for https://github.com/gradle/gradle/issues/17936
val archiveOperations = serviceOf<ArchiveOperations>()
val sourcesJar by lazy { compilerTask.get().archiveFile.get() }
from({ archiveOperations.zipTree(sourcesJar) })
}
javadocJar {
val compilerTask = project(":kotlin-compiler").tasks.named<Jar>("javadocJar")
dependsOn(compilerTask)
from(compilerTask.map { zipTree(it.archiveFile) })
// workaround for https://github.com/gradle/gradle/issues/17936
val archiveOperations = serviceOf<ArchiveOperations>()
val javadocJarFile by lazy { compilerTask.get().archiveFile.get() }
from({ archiveOperations.zipTree(javadocJarFile) })
}
projectTest {