Remove unused feather dep, move jgit dep to core as it's not needed b…

…y userdev

buildSrc/src/main/kotlin/config-kotlin.gradle.kts

@@ -40,13 +40,6 @@ repositories {
             includeGroupAndSubgroups("io.papermc")
         }
     }
-    maven("https://maven.parchmentmc.org") {
-        name = "ParchmentMC"
-        mavenContent {
-            releasesOnly()
-            includeGroupAndSubgroups("org.parchmentmc")
-        }
-    }
     maven("https://maven.neoforged.net/releases") {
         name = "NeoForged"
         mavenContent {

buildSrc/src/main/kotlin/config-publish.gradle.kts

@@ -80,12 +80,6 @@ val shadowJar by tasks.existing(ShadowJar::class) {
         /* -> */ "org.apache.commons",
         "org.cadixdev",
         /* -> */ "me.jamiemansfield",
-        "org.parchmentmc.feather",
-        /* -> */ "com.google.common",
-        /* ----> */ "com.google.j2objc",
-        /* ----> */ "com.google.thirdparty",
-        /* ----> */ "org.checkerframework",
-        /* ----> */ "javax.annotation",
         "org.eclipse.jgit",
         /* -> */ "com.googlecode.javaewah",
         /* -> */ "com.googlecode.javaewah32",

gradle/libs.versions.toml

@@ -3,7 +3,6 @@ asm = "9.7.1"
 lorenz = "0.5.8"
 hypo = "1.2.4"
 serialize = "1.5.1"
-feather = "1.1.0"
 jst = "1.0.68+paper.2-SNAPSHOT"
 tinyRemapper = "0.10.4"
 
@@ -33,9 +32,6 @@ hypo-mappings = { module = "dev.denwav.hypo:hypo-mappings", version.ref = "hypo"
 lorenzTiny = "net.fabricmc:lorenz-tiny:3.0.0"
 jbsdiff = "io.sigpipe:jbsdiff:1.0"
 
-feather-core = { module = "org.parchmentmc:feather", version.ref = "feather" }
-feather-gson = { module = "org.parchmentmc.feather:io-gson", version.ref = "feather" }
-
 diffpatch = "codechicken:DiffPatch:1.5.0.30"
 
 serialize-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialize" }

paperweight-core/build.gradle.kts

@@ -11,7 +11,9 @@ dependencies {
     implementation(variantOf(libs.diffpatch) { classifier("all") }) {
         isTransitive = false
     }
-    implementation(libs.jgit)
+    shade(libs.jgit)
+
+    testImplementation(project(":paperweight-lib", "testClassesJar"))
 }
 
 gradlePlugin {

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/PatchingTasks.kt

@@ -22,10 +22,10 @@
 
 package io.papermc.paperweight.core.taskcontainers
 
+import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
+import io.papermc.paperweight.core.tasks.patching.ApplyFilePatchesFuzzy
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.tasks.softspoon.ApplyFeaturePatches
-import io.papermc.paperweight.tasks.softspoon.ApplyFilePatches
-import io.papermc.paperweight.tasks.softspoon.ApplyFilePatchesFuzzy
 import io.papermc.paperweight.tasks.softspoon.FixupFilePatches
 import io.papermc.paperweight.tasks.softspoon.RebuildFilePatches
 import io.papermc.paperweight.util.*

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/ServerPatchingTasks.kt

@@ -24,10 +24,10 @@ package io.papermc.paperweight.core.taskcontainers
 
 import io.papermc.paperweight.core.extension.ForkConfig
 import io.papermc.paperweight.core.tasks.ForkSetup
+import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
+import io.papermc.paperweight.core.tasks.patching.ApplyFilePatchesFuzzy
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.tasks.softspoon.ApplyFeaturePatches
-import io.papermc.paperweight.tasks.softspoon.ApplyFilePatches
-import io.papermc.paperweight.tasks.softspoon.ApplyFilePatchesFuzzy
 import io.papermc.paperweight.tasks.softspoon.FixupFilePatches
 import io.papermc.paperweight.tasks.softspoon.ImportLibraryFiles
 import io.papermc.paperweight.tasks.softspoon.RebuildFilePatches

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt

@@ -24,10 +24,10 @@ package io.papermc.paperweight.core.taskcontainers
 
 import io.papermc.paperweight.core.coreExt
 import io.papermc.paperweight.core.extension.ForkConfig
+import io.papermc.paperweight.core.tasks.SetupVanilla
 import io.papermc.paperweight.tasks.*
 import io.papermc.paperweight.tasks.mache.DecompileJar
 import io.papermc.paperweight.tasks.mache.RemapJar
-import io.papermc.paperweight.tasks.mache.SetupVanilla
 import io.papermc.paperweight.tasks.softspoon.ImportLibraryFiles
 import io.papermc.paperweight.tasks.softspoon.IndexLibraryFiles
 import io.papermc.paperweight.tasks.softspoon.SetupPaperScript

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/FilterRepo.kt

@@ -23,7 +23,6 @@
 package io.papermc.paperweight.core.tasks
 
 import io.papermc.paperweight.tasks.*
-import io.papermc.paperweight.tasks.mache.commitAndTag
 import io.papermc.paperweight.util.*
 import io.papermc.paperweight.util.constants.*
 import org.eclipse.jgit.api.Git

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/ForkSetup.kt

@@ -23,7 +23,6 @@
 package io.papermc.paperweight.core.tasks
 
 import io.papermc.paperweight.tasks.*
-import io.papermc.paperweight.tasks.mache.commitAndTag
 import io.papermc.paperweight.tasks.softspoon.ApplySourceATs
 import io.papermc.paperweight.util.*
 import kotlin.io.path.*

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/mache/SetupVanilla.kt → paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/SetupVanilla.kt

@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.mache
+package io.papermc.paperweight.core.tasks
 
 import codechicken.diffpatch.cli.PatchOperation
 import codechicken.diffpatch.util.LoggingOutputStream
@@ -30,7 +30,6 @@ import io.papermc.paperweight.tasks.softspoon.ApplySourceATs
 import io.papermc.paperweight.util.*
 import java.nio.file.Path
 import java.util.function.Predicate
-import javax.inject.Inject
 import kotlin.io.path.*
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.ResetCommand
@@ -43,7 +42,6 @@ import org.gradle.api.logging.LogLevel
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.*
-import org.gradle.workers.WorkerExecutor
 
 abstract class SetupVanilla : JavaLauncherTask() {
 
@@ -69,9 +67,6 @@ abstract class SetupVanilla : JavaLauncherTask() {
     @get:InputDirectory
     abstract val macheOld: DirectoryProperty
 
-    @get:Inject
-    abstract val workerExecutor: WorkerExecutor
-
     @get:Nested
     val ats: ApplySourceATs = objects.newInstance()
 

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplyFilePatches.kt → paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplyFilePatches.kt

@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks.patching
 
 import codechicken.diffpatch.cli.PatchOperation
 import codechicken.diffpatch.match.FuzzyLineMatcher

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/softspoon/ApplyFilePatchesFuzzy.kt → paperweight-core/src/main/kotlin/io/papermc/paperweight/core/tasks/patching/ApplyFilePatchesFuzzy.kt

@@ -20,7 +20,7 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks.patching
 import codechicken.diffpatch.util.PatchMode
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input

paperweight-lib/src/test/kotlin/io/papermc/paperweight/tasks/softspoon/ApplyFilePatchesTest.kt → paperweight-core/src/test/kotlin/io/papermc/paperweight/core/tasks/ApplyFilePatchesTest.kt

@@ -20,8 +20,9 @@
  * USA
  */
 
-package io.papermc.paperweight.tasks.softspoon
+package io.papermc.paperweight.core.tasks
 
+import io.papermc.paperweight.core.tasks.patching.ApplyFilePatches
 import io.papermc.paperweight.tasks.*
 import java.nio.file.Path
 import kotlin.test.BeforeTest

paperweight-lib/build.gradle.kts

@@ -20,7 +20,6 @@ dependencies {
     implementation(libs.httpclient)
     implementation(libs.bundles.kotson)
     implementation(libs.coroutines)
-    implementation(libs.jgit)
 
     // ASM for inspection
     implementation(libs.bundles.asm)
@@ -30,14 +29,25 @@ dependencies {
 
     implementation(libs.lorenzTiny)
 
-    implementation(libs.feather.core)
-    implementation(libs.feather.gson)
-
     implementation(libs.jbsdiff)
 
     implementation(variantOf(libs.diffpatch) { classifier("all") }) {
         isTransitive = false
     }
 
+    testImplementation(libs.jgit)
     testImplementation(libs.mockk)
 }
+
+val testClassesJar = tasks.register<Jar>("testClassesJar") {
+    archiveClassifier.set("test-classes")
+    from(sourceSets.test.get().output.classesDirs)
+    dependsOn(sourceSets.test.get().classesTaskName)
+}
+configurations.consumable("testClassesJar") {
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
+    }
+    outgoing.artifact(testClassesJar)
+}