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

[repo] Update the shadow version to 8.1.1 release

Browse Source 
https://github.com/johnrengelman/shadow/releases/tag/8.1.1
This commit is contained in:
Yahor Berdnikau
2023-08-04 12:31:08 +02:00
committed by Space Team
parent c701677e45
commit 380062c511
15 changed files with 89 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pill/pill-importer/build.gradle.kts
+1
View File
@@ -17,6 +17,7 @@ dependencies {
compileOnly(gradleApi())
compileOnly(gradleKotlinDsl())
compileOnly(libs.shadow.gradlePlugin)
compileOnly(libs.jdom2)
}
sourceSets {
plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
+5 -5
View File
@@ -11,16 +11,17 @@ import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.SourceSet
import org.gradle.kotlin.dsl.extra
import org.gradle.kotlin.dsl.getByType
import org.jdom2.Element
import org.jdom2.Verifier
import org.jdom2.input.SAXBuilder
import org.jdom2.output.Format
import org.jdom2.output.XMLOutputter
import org.jetbrains.kotlin.pill.artifact.ArtifactDependencyMapper
import org.jetbrains.kotlin.pill.artifact.ArtifactGenerator
import org.jetbrains.kotlin.pill.model.PDependency
import org.jetbrains.kotlin.pill.model.PLibrary
import org.jetbrains.kotlin.pill.model.POrderRoot
import org.jetbrains.kotlin.pill.model.PProject
import shadow.org.jdom2.input.SAXBuilder
import shadow.org.jdom2.*
import shadow.org.jdom2.output.Format
import shadow.org.jdom2.output.XMLOutputter
import java.io.File
import java.util.*
import kotlin.collections.HashMap
@@ -290,7 +291,6 @@ class JpsCompatiblePluginTasks(
kotlinJunitConfiguration.applyJUnitTemplate()
val output = XMLOutputter().also {
@Suppress("UsePropertyAccessSyntax")
it.format = Format.getPrettyFormat().apply {
setEscapeStrategy { c -> Verifier.isHighSurrogate(c) || c == '"' }
setIndent(" ")
plugins/pill/pill-importer/src/util/XmlNode.kt
+4 -5
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.pill.util
import shadow.org.jdom2.Document
import shadow.org.jdom2.Element
import shadow.org.jdom2.output.Format
import shadow.org.jdom2.output.XMLOutputter
import org.jdom2.Document
import org.jdom2.Element
import org.jdom2.output.Format
import org.jdom2.output.XMLOutputter
fun xml(name: String, vararg args: Pair<String, Any>, block: XmlNode.() -> Unit = {}): XmlNode {
return XmlNode(name, args.asList(), block)
@@ -19,7 +19,6 @@ class XmlNode(val name: String, private val args: List<Pair<String, Any>>, block
private var value: Any? = null
init {
@Suppress("UNUSED_EXPRESSION")
block()
}