ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make RemapSources sourceCompatibility a property

Browse source
This commit is contained in:
Jason Penilla 2024-01-09 15:13:41 -07:00
parent 0b3688ca5b
commit 21f771d3e8
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/RemapSources.kt
View file

@ -45,6 +45,7 @@ import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.DirectoryProperty
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.*
import org.gradle.kotlin.dsl.*
import org.gradle.workers.WorkAction
@ -101,6 +102,9 @@ abstract class RemapSources : JavaLauncherTask() {
@get:OutputFile
abstract val spigotRecompiledClasses: RegularFileProperty
@get:Input
abstract val sourceCompatibility: Property<Int>
override fun init() {
super.init()
@ -109,6 +113,7 @@ abstract class RemapSources : JavaLauncherTask() {
testsOutputZip.convention(defaultOutput("$name-tests", "jar"))
generatedAt.convention(defaultOutput("at"))
spigotRecompiledClasses.convention(defaultOutput("spigotRecompiledClasses", "txt"))
sourceCompatibility.convention(17)
}
@TaskAction
@ -140,6 +145,8 @@ abstract class RemapSources : JavaLauncherTask() {
outputDir.set(srcOut)
generatedAtOutput.set(generatedAt.path)
sourceCompat.set(sourceCompatibility.orNull)
}
val testSrc = spigotServerDir.path.resolve("src/test/java")
@ -160,6 +167,8 @@ abstract class RemapSources : JavaLauncherTask() {
cacheDir.set(this@RemapSources.layout.cache)
outputDir.set(testOut)
sourceCompat.set(sourceCompatibility.orNull)
}
queue.await()
@ -210,7 +219,7 @@ abstract class RemapSources : JavaLauncherTask() {
// Remap any references Spigot maps to mojmap+yarn
Mercury().let { merc ->
merc.sourceCompatibility = JavaCore.VERSION_17
merc.sourceCompatibility = parameters.sourceCompat.map { it.toString() }.orNull ?: JavaCore.VERSION_17
merc.isGracefulClasspathChecks = true
merc.classPath.addAll(parameters.classpath.map { it.toPath() })
@ -265,6 +274,8 @@ abstract class RemapSources : JavaLauncherTask() {
val cacheDir: RegularFileProperty
val generatedAtOutput: RegularFileProperty
val outputDir: RegularFileProperty
val sourceCompat: Property<Int>
}
object ExplicitThisAdder : SourceRewriter {