Skip to content

Commit 08a74da

Browse files
wagyourtailwagyourtail
committed
fix convention & defaults.
1 parent e28efaa commit 08a74da

File tree

6 files changed

+43
-33
lines changed

6 files changed

+43
-33
lines changed

Diff for: ‎gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/JVMDowngraderExtension.kt

+3-17
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import xyz.wagyourtail.jvmdg.ClassDowngrader
1010
import xyz.wagyourtail.jvmdg.compile.ZipDowngrader
1111
import xyz.wagyourtail.jvmdg.gradle.flags.DowngradeFlags
1212
import xyz.wagyourtail.jvmdg.gradle.flags.ShadeFlags
13+
import xyz.wagyourtail.jvmdg.gradle.flags.convention
1314
import xyz.wagyourtail.jvmdg.gradle.flags.toFlags
1415
import xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar
1516
import xyz.wagyourtail.jvmdg.gradle.task.ShadeJar
@@ -78,21 +79,6 @@ abstract class JVMDowngraderExtension @Inject constructor(@get:Internal val proj
7879
multiReleaseVersions.convention(emptySet()).finalizeValueOnRead()
7980
}
8081

81-
fun convention(flags: ShadeFlags) {
82-
convention(flags as DowngradeFlags)
83-
flags.shadePath.convention(shadePath).finalizeValueOnRead()
84-
flags.shadeInlining.convention(shadeInlining).finalizeValueOnRead()
85-
}
86-
87-
fun convention(flags: DowngradeFlags) {
88-
flags.downgradeTo.convention(downgradeTo).finalizeValueOnRead()
89-
flags.apiJar.convention(apiJar).finalizeValueOnRead()
90-
flags.quiet.convention(quiet).finalizeValueOnRead()
91-
flags.debug.convention(debug).finalizeValueOnRead()
92-
flags.debugSkipStub.convention(debugSkipStub).finalizeValueOnRead()
93-
flags.debugSkipStubs.convention(debugSkipStubs).finalizeValueOnRead()
94-
}
95-
9682
@get:Internal
9783
internal val downgradedApis = defaultedMapOf<JavaVersion, Set<File>> { version ->
9884
val jars = mutableSetOf<File>()
@@ -131,7 +117,7 @@ abstract class JVMDowngraderExtension @Inject constructor(@get:Internal val proj
131117
spec.to.attribute(artifactType, "jar").attribute(downgradeAttr, true).attribute(shadeAttr, false)
132118

133119
spec.parameters {
134-
this@JVMDowngraderExtension.convention(it)
120+
it.convention(this@JVMDowngraderExtension)
135121
config(it)
136122
javaVersion = it.downgradeTo.get()
137123
}
@@ -151,7 +137,7 @@ abstract class JVMDowngraderExtension @Inject constructor(@get:Internal val proj
151137
spec.to.attribute(artifactType, "jar").attribute(shadeAttr, true).attribute(downgradeAttr, true)
152138

153139
spec.parameters {
154-
this@JVMDowngraderExtension.convention(it)
140+
it.convention(this@JVMDowngraderExtension)
155141
config(it)
156142
}
157143
}

Diff for: ‎gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/flags/toFlags.kt

+32-12
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,40 @@ import xyz.wagyourtail.jvmdg.version.map.FullyQualifiedMemberNameAndDesc
99
fun DowngradeFlags.toFlags(): Flags {
1010
val flags = Flags()
1111
flags.api = apiJar.orNull
12-
flags.quiet = quiet.getOrElse(false)
13-
flags.logAnsiColors = logAnsiColors.getOrElse(true)
14-
flags.logLevel = Logger.Level.valueOf(logLevel.getOrElse("INFO").uppercase())
15-
flags.printDebug = debug.getOrElse(false)
16-
flags.classVersion = downgradeTo.getOrElse(JavaVersion.VERSION_1_8).toOpcode()
17-
flags.debugSkipStub = debugSkipStub.getOrElse(emptySet()).map { FullyQualifiedMemberNameAndDesc.of(it) }.toSet()
12+
flags.quiet = quiet.getOrElse(flags.quiet)
13+
flags.logAnsiColors = logAnsiColors.getOrElse(flags.logAnsiColors)
14+
flags.logLevel = Logger.Level.valueOf(logLevel.getOrElse(flags.logLevel.name).uppercase())
15+
flags.printDebug = debug.getOrElse(flags.printDebug)
16+
flags.classVersion = downgradeTo.getOrElse(JavaVersion.forClassVersion(flags.classVersion)).toOpcode()
17+
flags.debugSkipStub = debugSkipStub.getOrElse(flags.debugSkipStub.map { it.toString() }.toSet()).map { FullyQualifiedMemberNameAndDesc.of(it) }.toSet()
1818
flags.debugSkipStubs = debugSkipStubs.getOrElse(emptySet()).map { it.toOpcode() }.toSet()
19-
ignoreWarningsIn.getOrElse(emptyList()).forEach { flags.addIgnore(it) }
20-
flags.debugDumpClasses = debugDumpClasses.getOrElse(false)
21-
flags.multiReleaseOriginal = multiReleaseOriginal.getOrElse(false)
22-
flags.multiReleaseVersions = multiReleaseVersions.getOrElse(emptySet()).map { it.toOpcode() }.toSet()
23-
flags.downgradeFromMultiReleases = downgradeFromMultiReleases.getOrElse(false)
19+
ignoreWarningsIn.getOrElse(flags.ignoreWarningsIn.map { it.key + "*".repeat(it.value.ordinal) }).forEach { flags.addIgnore(it) }
20+
flags.debugDumpClasses = debugDumpClasses.getOrElse(flags.debugDumpClasses)
21+
flags.multiReleaseOriginal = multiReleaseOriginal.getOrElse(flags.multiReleaseOriginal)
22+
flags.multiReleaseVersions = multiReleaseVersions.getOrElse(flags.multiReleaseVersions.map { JavaVersion.forClassVersion(it) }.toSet()).map { it.toOpcode() }.toSet()
23+
flags.downgradeFromMultiReleases = downgradeFromMultiReleases.getOrElse(flags.downgradeFromMultiReleases)
2424
if (this is ShadeFlags) {
25-
flags.shadeInlining = shadeInlining.get()
25+
flags.shadeInlining = shadeInlining.getOrElse(flags.shadeInlining)
2626
}
2727
return flags
28+
}
29+
30+
fun DowngradeFlags.convention(target: DowngradeFlags) {
31+
apiJar.convention(target.apiJar)
32+
quiet.convention(target.quiet)
33+
logAnsiColors.convention(target.logAnsiColors)
34+
logLevel.convention(target.logLevel)
35+
debug.convention(target.debug)
36+
downgradeTo.convention(target.downgradeTo)
37+
debugSkipStub.convention(target.debugSkipStub)
38+
debugSkipStubs.convention(target.debugSkipStubs)
39+
ignoreWarningsIn.convention(target.ignoreWarningsIn)
40+
debugDumpClasses.convention(target.debugDumpClasses)
41+
multiReleaseOriginal.convention(target.multiReleaseOriginal)
42+
multiReleaseVersions.convention(target.multiReleaseVersions)
43+
downgradeFromMultiReleases.convention(target.downgradeFromMultiReleases)
44+
if (this is ShadeFlags && target is ShadeFlags) {
45+
shadeInlining.convention(target.shadeInlining)
46+
shadePath.convention(target.shadePath)
47+
}
2848
}

Diff for: ‎gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/DowngradeJar.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import xyz.wagyourtail.jvmdg.ClassDowngrader
1010
import xyz.wagyourtail.jvmdg.compile.ZipDowngrader
1111
import xyz.wagyourtail.jvmdg.gradle.JVMDowngraderExtension
1212
import xyz.wagyourtail.jvmdg.gradle.flags.DowngradeFlags
13+
import xyz.wagyourtail.jvmdg.gradle.flags.convention
1314
import xyz.wagyourtail.jvmdg.gradle.flags.toFlags
1415
import xyz.wagyourtail.jvmdg.util.FinalizeOnRead
1516
import xyz.wagyourtail.jvmdg.util.LazyMutable
@@ -37,7 +38,7 @@ abstract class DowngradeJar: Jar(), DowngradeFlags {
3738
group = "JVMDowngrader"
3839
description = "Downgrades the jar to the specified version"
3940

40-
jvmdg.convention(this)
41+
convention(jvmdg)
4142
}
4243

4344
@TaskAction

Diff for: ‎gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/ShadeJar.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.gradle.api.tasks.bundling.Jar
99
import xyz.wagyourtail.jvmdg.compile.ApiShader
1010
import xyz.wagyourtail.jvmdg.gradle.JVMDowngraderExtension
1111
import xyz.wagyourtail.jvmdg.gradle.flags.ShadeFlags
12+
import xyz.wagyourtail.jvmdg.gradle.flags.convention
1213
import xyz.wagyourtail.jvmdg.gradle.flags.toFlags
1314
import xyz.wagyourtail.jvmdg.util.deleteIfExists
1415
import xyz.wagyourtail.jvmdg.util.readZipInputStreamFor
@@ -31,7 +32,7 @@ abstract class ShadeJar: Jar(), ShadeFlags {
3132
group = "JVMDowngrader"
3233
description = "Downgrades the jar to the specified version"
3334

34-
jvmdg.convention(this)
35+
convention(jvmdg)
3536
}
3637

3738
@TaskAction

Diff for: ‎gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/files/DowngradeFiles.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import xyz.wagyourtail.jvmdg.ClassDowngrader
1010
import xyz.wagyourtail.jvmdg.compile.PathDowngrader
1111
import xyz.wagyourtail.jvmdg.gradle.JVMDowngraderExtension
1212
import xyz.wagyourtail.jvmdg.gradle.flags.DowngradeFlags
13+
import xyz.wagyourtail.jvmdg.gradle.flags.convention
1314
import xyz.wagyourtail.jvmdg.gradle.flags.toFlags
1415
import xyz.wagyourtail.jvmdg.util.FinalizeOnRead
1516
import xyz.wagyourtail.jvmdg.util.LazyMutable
@@ -62,7 +63,7 @@ abstract class DowngradeFiles: ConventionTask(), DowngradeFlags {
6263
}
6364

6465
init {
65-
jvmdg.convention(this)
66+
convention(jvmdg)
6667
}
6768

6869
@TaskAction

Diff for: ‎gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/files/ShadeFiles.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.gradle.api.tasks.TaskAction
88
import xyz.wagyourtail.jvmdg.compile.ApiShader
99
import xyz.wagyourtail.jvmdg.gradle.JVMDowngraderExtension
1010
import xyz.wagyourtail.jvmdg.gradle.flags.ShadeFlags
11+
import xyz.wagyourtail.jvmdg.gradle.flags.convention
1112
import xyz.wagyourtail.jvmdg.gradle.flags.toFlags
1213
import xyz.wagyourtail.jvmdg.util.FinalizeOnRead
1314
import xyz.wagyourtail.jvmdg.util.MustSet
@@ -47,7 +48,7 @@ abstract class ShadeFiles: ConventionTask(), ShadeFlags {
4748
}
4849

4950
init {
50-
jvmdg.convention(this)
51+
convention(jvmdg)
5152
}
5253

5354
// fun setShadePath(path: String) {

0 commit comments

Comments
 (0)