a lot more progress on integrating forked snakeyaml and proper tag handling

Author: zml2008

.github/workflows/codeql-analysis.yml

@@ -14,6 +14,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
+      with:
+        submodules: recursive
     - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:

.github/workflows/test-build.yml

@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0 # checkout full history for site generation
+          submodules: recursive
       - name: Setup JDK 11
         uses: actions/setup-java@v2
         with:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/snakeyaml"]
+	path = vendor/snakeyaml
+	url = https://bitbucket.org/zml2008/snakeyaml.git

buildSrc/gradle.lockfile

@@ -6,7 +6,7 @@ com.github.siom79.japicmp:japicmp:0.15.3=compileClasspath,runtimeClasspath,testC
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:30.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:30.1.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.googlecode.javaewah:JavaEWAH:1.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -20,31 +20,31 @@ com.pinterest.ktlint:ktlint-ruleset-experimental:0.40.0=ktlint
 com.pinterest.ktlint:ktlint-ruleset-standard:0.40.0=ktlint
 com.pinterest.ktlint:ktlint-ruleset-test:0.40.0=ktlint
 com.pinterest:ktlint:0.40.0=ktlint
-com.sun.istack:istack-commons-runtime:3.0.8=compileClasspath,runtimeClasspath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=compileClasspath,runtimeClasspath
-de.thetaphi:forbiddenapis:3.1=compileClasspath,runtimeClasspath
-gradle.plugin.org.cadixdev.gradle:licenser:0.6.0=compileClasspath,runtimeClasspath
+com.sun.istack:istack-commons-runtime:3.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.sun.xml.fastinfoset:FastInfoset:1.2.16=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+de.thetaphi:forbiddenapis:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+gradle.plugin.org.cadixdev.gradle:licenser:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 info.picocli:picocli:3.9.6=ktlint
-io.github.gradle-nexus:publish-plugin:1.0.0=runtimeClasspath
-jakarta.activation:jakarta.activation-api:1.2.1=compileClasspath,runtimeClasspath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=compileClasspath,runtimeClasspath
-javax.activation:activation:1.1=compileClasspath,runtimeClasspath
-me.champeau.gradle:japicmp-gradle-plugin:0.2.9=compileClasspath,runtimeClasspath
-net.kyori:indra-common:2.0.3=compileClasspath,runtimeClasspath
-net.kyori:indra-git:2.0.3=compileClasspath,runtimeClasspath
-net.kyori:indra-publishing-sonatype:2.0.3=compileClasspath,runtimeClasspath
-net.kyori:mammoth:1.0.0=compileClasspath,runtimeClasspath
-net.ltgt.gradle:gradle-errorprone-plugin:2.0.1=compileClasspath,runtimeClasspath
-net.ltgt.gradle:gradle-nullaway-plugin:1.1.0=compileClasspath,runtimeClasspath
-org.checkerframework:checker-qual:3.12.0=compileClasspath
-org.checkerframework:checker-qual:3.8.0=runtimeClasspath
+io.github.gradle-nexus:publish-plugin:1.1.0=runtimeClasspath,testRuntimeClasspath
+jakarta.activation:jakarta.activation-api:1.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+me.champeau.gradle:japicmp-gradle-plugin:0.2.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.kyori:indra-common:2.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.kyori:indra-git:2.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.kyori:indra-publishing-sonatype:2.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.kyori:mammoth:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.ltgt.gradle:gradle-errorprone-plugin:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.ltgt.gradle:gradle-nullaway-plugin:1.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.13.0=compileClasspath,testCompileClasspath
+org.checkerframework:checker-qual:3.8.0=runtimeClasspath,testRuntimeClasspath
 org.ec4j.core:ec4j-core:0.2.2=ktlint
-org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r=compileClasspath,runtimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=compileClasspath,runtimeClasspath
-org.glassfish.jaxb:txw2:2.3.2=compileClasspath,runtimeClasspath
-org.immutables:builder:2.8.8=compileClasspath
-org.immutables:value:2.8.8=compileClasspath
-org.javassist:javassist:3.24.0-GA=compileClasspath,runtimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:jaxb-runtime:2.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jaxb:txw2:2.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.immutables:builder:2.8.8=compileClasspath,testCompileClasspath
+org.immutables:value:2.8.8=compileClasspath,testCompileClasspath
+org.javassist:javassist:3.24.0-GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,ktlint
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.10=ktlint
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.31=kotlinCompilerClasspath
@@ -53,7 +53,7 @@ org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.31=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.31=kotlinCompilerPluginClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.31=kotlinCompilerPluginClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.4.10=ktlint
-org.jetbrains.kotlin:kotlin-reflect:1.4.31=compileClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.4.31=compileClasspath,kotlinCompilerClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-sam-with-receiver:1.4.31=kotlinCompilerPluginClasspath
 org.jetbrains.kotlin:kotlin-script-runtime:1.4.10=ktlint
 org.jetbrains.kotlin:kotlin-script-runtime:1.4.31=kotlinCompilerClasspath,kotlinCompilerPluginClasspath
@@ -62,21 +62,17 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.31=kotlinCompilerP
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.31=kotlinCompilerPluginClasspath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31=kotlinCompilerPluginClasspath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10=ktlint
-empty=ktlintReporter,ktlintRuleset
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31=compileClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31=compileClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31=compileClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.10=ktlint
 org.jetbrains.kotlin:kotlin-stdlib:1.4.20=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.4.31=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=kotlinCompilerPluginClasspath
 org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,ktlint,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jvnet.staxex:stax-ex:1.8.1=compileClasspath,runtimeClasspath
+org.jvnet.staxex:stax-ex:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-xerces:xercesImpl:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-xml-apis:xml-apis:1.3.04=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-xml-resolver:xml-resolver:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,ktlintReporter,ktlintRuleset,testAnnotationProcessor

format/yaml/build.gradle.kts

@@ -3,32 +3,90 @@ import org.spongepowered.configurate.build.useAutoValue
 
 plugins {
     id("org.spongepowered.configurate.build.component")
+    id("com.github.johnrengelman.shadow") version "6.1.0"
     groovy // For writing tests
 }
 
 description = "YAML format loader for Configurate"
 
 tasks.withType(GroovyCompile::class).configureEach {
     // Toolchains need this... for some reason
-    options.release.set(indra.javaVersions.target)
+    options.release.set(indra.javaVersions().target())
     sourceCompatibility = "1.8"
     targetCompatibility = "1.8"
 }
 
+val shaded by configurations.registering {
+    resolutionStrategy.deactivateDependencyLocking()
+}
+
+configurations {
+    compileClasspath { extendsFrom(shaded.get()) }
+    runtimeClasspath { extendsFrom(shaded.get()) }
+}
+
 useAutoValue()
 dependencies {
     api(projects.core)
     // When updating snakeyaml, check ConfigurateScanner for changes against upstream
-    implementation("org.yaml:snakeyaml:1.+")
+    "shaded"("configurate.thirdparty:snakeyaml:version-from-submodule")
 
     testImplementation("org.codehaus.groovy:groovy:3.+:indy")
     testImplementation("org.codehaus.groovy:groovy-nio:3.+:indy")
     testImplementation("org.codehaus.groovy:groovy-test-junit5:3.+:indy")
     testImplementation("org.codehaus.groovy:groovy-templates:3.+:indy")
 }
+tasks {
+    shadowJar {
+        configurations = listOf(shaded.get())
+        minimize()
+        relocate("org.yaml.snakeyaml", "${project.group}.configurate.yaml.internal.snakeyaml")
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    pmdMain {
+        isEnabled = false
+    }
+}
+
+if (project.hasProperty("spongeKeyStore")) {
+    // Just update the input of the sign jar task
+    tasks.shadowJar {
+        archiveClassifier.set("unsigned-all")
+    }
+
+    tasks.named("sign", org.spongepowered.configurate.build.SignJarTask::class) {
+        dependsOn(tasks.shadowJar)
+        // TODO: this is super ugly, need to give jar signing a bit of a redesign
+        (this.rootSpec as org.gradle.api.internal.file.copy.DefaultCopySpec).sourcePaths.clear()
+        from(zipTree(tasks.shadowJar.get().outputs.files.singleFile))
+    }
+} else {
+    // Replace the default artifact
+    // We have to replace the default artifact which is a bit ugly
+    // https://github.com/gradle/gradle/pull/13650 should make it easier
+    fun forRelevantOutgoings(action: ConfigurationPublications.() -> Unit) {
+        configurations[JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME].outgoing.action()
+        configurations[JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME].outgoing.action()
+    }
+
+    forRelevantOutgoings {
+        artifact(tasks.shadowJar)
+    }
+
+    tasks.shadowJar {
+        archiveClassifier.set("")
+    }
+    tasks.jar {
+        archiveClassifier.set("thin")
+    }
 
-tasks.compileJava {
-    options.errorprone.excludedPaths.set(".*org[\\\\/]spongepowered[\\\\/]configurate[\\\\/]yaml[\\\\/]ConfigurateScanner.*")
-    // our vendored version of ScannerImpl has invalid JD, so we have to suppress some warnings
-    options.compilerArgs.add("-Xdoclint:-html")
+    afterEvaluate {
+        forRelevantOutgoings {
+            artifacts.removeIf { it.classifier == "thin" }
+        }
+    }
 }