Skip to content

Commit

Permalink
Switch licenser plugin. (QuiltMC#354)
Browse files Browse the repository at this point in the history
  • Loading branch information
LambdAurora authored and cocona20xx committed Jan 31, 2024
1 parent 548700c commit 74b9fb1
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 47 deletions.
2 changes: 1 addition & 1 deletion build-logic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
implementation libs.quilt.loom
implementation libs.indra.git
implementation libs.quilt.parsers.json
implementation libs.quilt.gradle.licenser
implementation libs.yumi.gradle.licenser

implementation libs.bundles.asm
}
Expand Down
4 changes: 2 additions & 2 deletions build-logic/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
asm = "9.5"
indra_git = "3.1.2"
quilt_gradle_licenser = "2.+"
yumi_gradle_licenser = "1.0.+"
quilt_parsers = "0.2.1"
quilt_loom = "1.4.1"

Expand All @@ -14,7 +14,7 @@ asm_util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }

indra_git = { module = "net.kyori:indra-git", version.ref = "indra_git" }

quilt_gradle_licenser = { module = "org.quiltmc:quilt-gradle-licenser", version.ref = "quilt_gradle_licenser" }
yumi_gradle_licenser = { module = "dev.yumi:yumi-gradle-licenser", version.ref = "yumi_gradle_licenser" }
quilt_parsers_json = { module = "org.quiltmc.parsers:json", version.ref = "quilt_parsers" }
quilt_loom = { module = "org.quiltmc:loom", version.ref = "quilt_loom" }

Expand Down
6 changes: 1 addition & 5 deletions build-logic/src/main/groovy/qsl.module.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
id("java-library")
id("maven-publish")
id("net.kyori.indra.git")
id("org.quiltmc.gradle.licenser")
id("dev.yumi.gradle.licenser")
id("qsl.common")
}

Expand Down Expand Up @@ -193,9 +193,5 @@ javadoc {
}

license {
rule rootProject.file("codeformat/COLONEL_MODIFIED_HEADER")
rule rootProject.file("codeformat/FABRIC_MODIFIED_HEADER")
rule rootProject.file("codeformat/HEADER")

include "**/*.java"
}
18 changes: 0 additions & 18 deletions codeformat/COLONEL_MODIFIED_HEADER

This file was deleted.

18 changes: 0 additions & 18 deletions codeformat/FABRIC_MODIFIED_HEADER

This file was deleted.

10 changes: 7 additions & 3 deletions codeformat/HEADER
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
Copyright ${YEAR} The Quilt Project
#optional
Copyright 2016, 2017, 2018, 2019 FabricMC
#end
#optional
Copyright 2016, 2017, 2018, 2019, 2020 zml and Colonel contributors
#end
Copyright ${CREATION_YEAR} The Quilt Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -11,5 +17,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

;;year_display: creation_only

0 comments on commit 74b9fb1

Please sign in to comment.