test

.github/workflows/deploy-snapshot.yml

@@ -12,25 +12,15 @@ on:
 jobs:
   deploy:
     name: Deploy Snapshot
-    runs-on: namespace-profile-linux-default
+    runs-on: 'ubuntu-latest'
     steps:
-      - uses: namespacelabs/nscloud-checkout-action@v9
-      - uses: actions/setup-java@v6
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
           java-version: 21
-          cache: "" # namespace handles this
-      - name: Set up cache
-        uses: namespacelabs/nscloud-cache-action@v1
-        with:
-          cache: gradle
-      - name: Setup gradle build cache
-        run: |
-          nsc cache gradle setup --init-gradle /tmp/init.gradle
+          distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
-        with:
-          cache-disabled: true # namespace handles this
       - name: Get project version
         id: get_version
         shell: bash
@@ -39,7 +29,7 @@ jobs:
           echo version=$project_version >> $GITHUB_OUTPUT
       - name: Deploy snapshot version
         if: endsWith(steps.get_version.outputs.version, '-SNAPSHOT')
-        run: ./gradlew --init-script=/tmp/init.gradle -Dorg.gradle.parallel=true publish --no-daemon --stacktrace -Dorg.gradle.internal.http.socketTimeout=90000 -Dorg.gradle.internal.http.connectionTimeout=90000
+        run: ./gradlew -Dorg.gradle.parallel=true publishAllPublicationsToCanvasMC_SnapshotsRepository --no-daemon --stacktrace -Dorg.gradle.internal.http.socketTimeout=90000 -Dorg.gradle.internal.http.connectionTimeout=90000
         env:
-          ORG_GRADLE_PROJECT_paperUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ORG_GRADLE_PROJECT_paperPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
+          PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}

.github/workflows/deploy.yml

@@ -6,35 +6,25 @@ on:
 jobs:
   deploy:
     name: Deploy
-    runs-on: namespace-profile-linux-default
+    runs-on: 'ubuntu-latest'
     steps:
-      - uses: namespacelabs/nscloud-checkout-action@v9
-      - uses: actions/setup-java@v6
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
           java-version: 21
-          cache: "" # namespace handles this
-      - name: Set up cache
-        uses: namespacelabs/nscloud-cache-action@v1
-        with:
-          cache: gradle
-      - name: Setup gradle build cache
-        run: |
-          nsc cache gradle setup --init-gradle /tmp/init.gradle
+          distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
-        with:
-          cache-disabled: true # namespace handles this
       - name: Deploy release
-        run: ./gradlew --init-script=/tmp/init.gradle publishPlugins --no-daemon --stacktrace
+        run: ./gradlew publishAllPublicationsToCanvasMC_ReleasesRepository --no-daemon --stacktrace
         env:
-          GRADLE_PUBLISH_KEY: "${{ secrets.GRADLE_PLUGIN_PORTAL_KEY }}"
-          GRADLE_PUBLISH_SECRET: "${{ secrets.GRADLE_PLUGIN_PORTAL_SECRET }}"
+          PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
+          PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
       - name: Parse tag
         id: vars
-        run: echo "tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
       - name: Create release and changelog
         uses: MC-Machinations/auto-release-changelog@v1.1.3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          title: paperweight ${{ steps.vars.outputs.tag }}
+          title: weaver ${{ steps.vars.outputs.tag }}

.github/workflows/test.yml

@@ -9,30 +9,20 @@ jobs:
     # Only run on PRs if the source branch is on someone else's repo
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     name: Test
-    runs-on: namespace-profile-linux-default
+    runs-on: 'ubuntu-latest'
     steps:
-      - uses: namespacelabs/nscloud-checkout-action@v9
-      - uses: actions/setup-java@v6
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
           java-version: 21
-          cache: "" # namespace handles this
-      - name: Set up cache
-        uses: namespacelabs/nscloud-cache-action@v1
-        with:
-          cache: gradle
-      - name: Setup gradle build cache
-        run: |
-          nsc cache gradle setup --init-gradle /tmp/init.gradle
+          distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
-        with:
-          cache-disabled: true # namespace handles this
       - name: Execute Gradle build
         run: |
           git config --global user.email "no-reply@github.com"
           git config --global user.name "GitHub Actions"
-          ./gradlew --init-script=/tmp/init.gradle build --no-daemon --stacktrace
+          ./gradlew build --no-daemon --stacktrace
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v6
         if:  always()

build-logic/build.gradle.kts

@@ -0,0 +1,28 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(libs.gradle.ktlint)
+    implementation(libs.gradle.level.headered)
+    implementation(libs.gradle.shadow)
+    implementation(libs.gradle.kotlin.dsl)
+    implementation(kotlin("gradle-plugin", embeddedKotlinVersion))
+    implementation(libs.gradle.plugin.publish)
+
+    /*
+    constraints {
+        // spotless carries 1.9.10 and kotlin-dsl plugin has a strictly 2.4.0 constraint
+        implementation("org.jetbrains.kotlin:kotlin-stdlib") {
+            version {
+                strictly(embeddedKotlinVersion)
+            }
+        }
+    }
+     */
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        register("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"

buildSrc/src/main/kotlin/config-kotlin.gradle.kts → build-logic/src/main/kotlin/config-kotlin.gradle.kts

@@ -2,6 +2,7 @@ import net.octyl.levelheadered.HeaderApplyTask
 import net.octyl.levelheadered.HeaderVerifyTask
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -25,14 +26,15 @@ kotlin {
     }
     compilerOptions {
         jvmTarget = JvmTarget.JVM_21
-        freeCompilerArgs = listOf("-Xjvm-default=all", "-Xjdk-release=21")
+        jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
+        freeCompilerArgs = listOf("-Xjdk-release=21")
     }
 }
 
 repositories {
     maven("https://repo.papermc.io/repository/maven-public/") {
         mavenContent {
-            includeGroup("codechicken")
+            includeGroup("io.codechicken")
             includeGroup("net.fabricmc")
             includeGroupAndSubgroups("io.papermc")
         }
@@ -103,7 +105,7 @@ ktlint {
 }
 
 levelHeadered {
-    headerTemplate(rootProject.file("license/copyright.txt"))
+    headerTemplate(isolated.rootProject.projectDirectory.file("license/copyright.txt").asFile)
 }
 
 tasks.named<HeaderApplyTask>("applyTestHeader") {

buildSrc/src/main/kotlin/config-publish.gradle.kts → build-logic/src/main/kotlin/config-publish.gradle.kts

@@ -2,7 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.plugin.compatibility.compatibility
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
     id("com.gradleup.shadow")
     id("com.gradle.plugin-publish")
 }
@@ -17,21 +16,34 @@ if (noRelocate) {
     }
 }
 
-val shade = configurations.create("shade")
+val sourcesJar = configurations.dependencyScope("sourcesJar")
+val sourcesJarResolvable = configurations.resolvable("sourcesJarResolvable") {
+    extendsFrom(sourcesJar)
+}
+
+dependencies {
+    sourcesJar(project(":paperweight-lib", "sourcesJar"))
+}
+
+val shade = configurations.dependencyScope("shade")
+val shadeResolvable = configurations.resolvable("shadeResolvable") {
+    extendsFrom(shade)
+}
+
 configurations.implementation {
     extendsFrom(shade)
 }
 
 configurations.shadowRuntimeElements {
-    compatibilityAttributes(objects)
+    compatibilityAttributes()
 }
 configurations.runtimeElements {
-    compatibilityAttributes(objects)
+    compatibilityAttributes()
 }
 
 fun ShadowJar.configureStandard() {
-    configurations = listOf(shade)
-    filesMatching("META-INF/services/**") {
+    configurations.setFrom(listOf(shadeResolvable))
+    filesMatching("META-INF/**") {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
     filesMatching("META-INF/*.kotlin_module") {
@@ -48,23 +60,25 @@ fun ShadowJar.configureStandard() {
     mergeServiceFiles()
 }
 
-val sourcesJar = tasks.named<AbstractArchiveTask>("sourcesJar") {
-    from(
-        zipTree(project(":paperweight-lib").tasks
-            .named("sourcesJar", AbstractArchiveTask::class)
-            .flatMap { it.archiveFile })
-    ) {
+private fun SetProperty<Configuration>.setFrom(configurations: List<NamedDomainObjectProvider<out Configuration>>) {
+    empty()
+    configurations.forEach { add(it) }
+}
+
+val libSourcesJar = tasks.named<AbstractArchiveTask>("sourcesJar") {
+    from(zipTree(sourcesJarResolvable.flatMap { it.elements.map { it.single().asFile } })) {
         exclude("META-INF/**")
     }
 }
 
 gradlePlugin {
-    website.set("https://github.com/PaperMC/paperweight")
-    vcsUrl.set("https://github.com/PaperMC/paperweight")
+    website.set("https://github.com/CraftCanvasMC/weaver/")
+    vcsUrl.set("https://github.com/CraftCanvasMC/weaver/")
     plugins.configureEach {
         compatibility {
             features {
                 configurationCache = true
+                isolatedProjects = true
             }
         }
     }
@@ -81,8 +95,8 @@ val shadowJar = tasks.named<ShadowJar>("shadowJar") {
 
     val prefix = "paper.libs"
     listOf(
-        "codechicken.diffpatch",
-        /* -> */ "codechicken.repack",
+        "io.codechicken.diffpatch",
+        /* -> */ "io.codechicken.repack",
         "com.github.salomonbrys.kotson",
         "com.google.gson",
         "dev.denwav.hypo",
@@ -112,9 +126,19 @@ val shadowJar = tasks.named<ShadowJar>("shadowJar") {
 
 publishing {
     repositories {
-        maven("https://artifactory.papermc.io/artifactory/snapshots/") {
-            credentials(PasswordCredentials::class)
-            name = "paper"
+        maven("https://maven.canvasmc.io/snapshots") {
+            name = "CanvasMC_Snapshots"
+            credentials {
+                username = providers.environmentVariable("PUBLISH_USER").orNull
+                password = providers.environmentVariable("PUBLISH_TOKEN").orNull
+            }
+        }
+        maven("https://maven.canvasmc.io/releases") {
+            name = "CanvasMC_Releases"
+            credentials {
+                username = providers.environmentVariable("PUBLISH_USER").orNull
+                password = providers.environmentVariable("PUBLISH_TOKEN").orNull
+            }
         }
     }
 
@@ -128,13 +152,13 @@ publishing {
 }
 
 fun MavenPom.pomConfig() {
-    val repoPath = "PaperMC/paperweight"
+    val repoPath = "CraftCanvasMC/weaver"
     val repoUrl = "https://github.com/$repoPath"
 
-    name.set("paperweight")
-    description.set("Gradle plugin for the PaperMC project")
+    name.set("weaver")
+    description.set("Gradle plugin for the CanvasMC project")
     url.set(repoUrl)
-    inceptionYear.set("2020")
+    inceptionYear.set("2025")
 
     licenses {
         license {
@@ -151,10 +175,9 @@ fun MavenPom.pomConfig() {
 
     developers {
         developer {
-            id.set("DenWav")
-            name.set("Kyle Wood")
-            email.set("kyle@denwav.dev")
-            url.set("https://github.com/DenWav")
+            id.set("CanvasMC")
+            name.set("Canvas")
+            url.set("https://github.com/CraftCanvasMC")
         }
     }
 

buildSrc/src/main/kotlin/utils.kt → build-logic/src/main/kotlin/utils.kt

@@ -2,23 +2,22 @@ import org.gradle.api.Action
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.attributes.java.TargetJvmVersion
 import org.gradle.api.attributes.plugin.GradlePluginApiVersion
-import org.gradle.api.model.ObjectFactory
 import org.gradle.kotlin.dsl.*
 import org.gradle.plugin.devel.GradlePluginDevelopmentExtension
 import org.gradle.plugin.devel.PluginDeclaration
 
-fun Configuration.compatibilityAttributes(objects: ObjectFactory) {
+fun Configuration.compatibilityAttributes() {
     attributes {
         attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
-        attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named("9.7.1"))
+        attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, named("9.7.1"))
     }
 }
 
 fun GradlePluginDevelopmentExtension.setupPlugin(prefix: String, op: Action<PluginDeclaration>) {
-    plugins.register("paperweight-$prefix") {
-        id = "io.papermc.paperweight." + prefix
-        displayName = "paperweight $prefix"
-        tags.set(listOf("paper", "minecraft"))
+    plugins.register("weaver-$prefix") {
+        id = "io.canvasmc.weaver." + prefix
+        displayName = "weaver $prefix"
+        tags.set(listOf("paper", "minecraft", "canvas"))
         op.execute(this)
     }
 }

build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    `kotlin-dsl` apply false
+}
+
 tasks.register("printVersion") {
     val ver = project.version
     doFirst {