From c6ad98b9793e890f23838965f631d960ff3498aa Mon Sep 17 00:00:00 2001 From: phinner <62483793+phinner@users.noreply.github.com> Date: Sun, 26 May 2024 01:45:07 +0200 Subject: [PATCH] chore: Fix license header --- HEADER.txt | 25 +++++++++++++++++++ LICENSE_HEADER.md | 23 ----------------- build.gradle.kts | 6 +---- .../kotlin/com/xpdustry/toxopid/Toxopid.kt | 2 +- .../com/xpdustry/toxopid/ToxopidExtension.kt | 25 +++++++++++++++++++ .../xpdustry/toxopid/ToxopidExtensionImpl.kt | 2 +- .../toxopid/extension/DependencyExtensions.kt | 2 +- .../toxopid/extension/HJSONExtensions.kt | 25 +++++++++++++++++++ .../toxopid/extension/ProjectExtensions.kt | 25 +++++++++++++++++++ .../toxopid/extension/TaskExtensions.kt | 25 +++++++++++++++++++ .../toxopid/plugin/ToxopidBasePlugin.kt | 2 +- .../toxopid/plugin/ToxopidJavaPlugin.kt | 2 +- .../xpdustry/toxopid/plugin/ToxopidPlugin.kt | 2 +- .../toxopid/plugin/ToxopidShadowPlugin.kt | 2 +- .../xpdustry/toxopid/spec/ModDependency.kt | 25 +++++++++++++++++++ .../com/xpdustry/toxopid/spec/ModMetadata.kt | 2 +- .../com/xpdustry/toxopid/spec/ModPlatform.kt | 2 +- .../toxopid/task/GithubAssetDownload.kt | 2 +- .../xpdustry/toxopid/task/MindustryExec.kt | 2 +- 19 files changed, 162 insertions(+), 39 deletions(-) create mode 100644 HEADER.txt delete mode 100644 LICENSE_HEADER.md diff --git a/HEADER.txt b/HEADER.txt new file mode 100644 index 0000000..f2613f6 --- /dev/null +++ b/HEADER.txt @@ -0,0 +1,25 @@ +/* + * This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. + * + * MIT License + * + * Copyright (c) 2024 Xpdustry + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ \ No newline at end of file diff --git a/LICENSE_HEADER.md b/LICENSE_HEADER.md deleted file mode 100644 index f6ffd6f..0000000 --- a/LICENSE_HEADER.md +++ /dev/null @@ -1,23 +0,0 @@ -This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. - -MIT License - -Copyright (c) 2023 Xpdustry - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/build.gradle.kts b/build.gradle.kts index 08cef4b..1132454 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,6 @@ plugins { id("net.kyori.indra") version "3.1.3" id("net.kyori.indra.git") version "3.1.3" id("net.kyori.indra.publishing.gradle-plugin") version "3.1.3" - id("net.kyori.indra.licenser.spotless") version "3.1.3" `kotlin-dsl` } @@ -36,6 +35,7 @@ signing { spotless { kotlin { ktlint() + licenseHeaderFile(rootProject.file("HEADER.txt")) } kotlinGradle { ktlint() @@ -92,10 +92,6 @@ indraPluginPublishing { ) } -indraSpotlessLicenser { - licenseHeaderFile(rootProject.file("LICENSE_HEADER.md")) -} - tasks.javadocJar { from(tasks.dokkaHtml) } diff --git a/src/main/kotlin/com/xpdustry/toxopid/Toxopid.kt b/src/main/kotlin/com/xpdustry/toxopid/Toxopid.kt index 70e49ab..7a02744 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/Toxopid.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/Toxopid.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtension.kt b/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtension.kt index bbe9b54..e31a68b 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtension.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtension.kt @@ -1,3 +1,28 @@ +/* + * This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. + * + * MIT License + * + * Copyright (c) 2024 Xpdustry + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ package com.xpdustry.toxopid import com.xpdustry.toxopid.spec.ModPlatform diff --git a/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtensionImpl.kt b/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtensionImpl.kt index 0f28905..5b8cf11 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtensionImpl.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/ToxopidExtensionImpl.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/extension/DependencyExtensions.kt b/src/main/kotlin/com/xpdustry/toxopid/extension/DependencyExtensions.kt index 5e89039..da763f3 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/extension/DependencyExtensions.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/extension/DependencyExtensions.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/extension/HJSONExtensions.kt b/src/main/kotlin/com/xpdustry/toxopid/extension/HJSONExtensions.kt index 8935422..8cfb08d 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/extension/HJSONExtensions.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/extension/HJSONExtensions.kt @@ -1,3 +1,28 @@ +/* + * This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. + * + * MIT License + * + * Copyright (c) 2024 Xpdustry + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ package com.xpdustry.toxopid.extension import kotlinx.serialization.json.JsonArray diff --git a/src/main/kotlin/com/xpdustry/toxopid/extension/ProjectExtensions.kt b/src/main/kotlin/com/xpdustry/toxopid/extension/ProjectExtensions.kt index 2d0e543..aefd82c 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/extension/ProjectExtensions.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/extension/ProjectExtensions.kt @@ -1,3 +1,28 @@ +/* + * This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. + * + * MIT License + * + * Copyright (c) 2024 Xpdustry + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ package com.xpdustry.toxopid.extension import com.xpdustry.toxopid.Toxopid diff --git a/src/main/kotlin/com/xpdustry/toxopid/extension/TaskExtensions.kt b/src/main/kotlin/com/xpdustry/toxopid/extension/TaskExtensions.kt index 78a6e18..df7e42c 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/extension/TaskExtensions.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/extension/TaskExtensions.kt @@ -1,3 +1,28 @@ +/* + * This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. + * + * MIT License + * + * Copyright (c) 2024 Xpdustry + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ package com.xpdustry.toxopid.extension import com.xpdustry.toxopid.task.GithubAssetDownload diff --git a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidBasePlugin.kt b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidBasePlugin.kt index cdebd1b..3c219cc 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidBasePlugin.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidBasePlugin.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidJavaPlugin.kt b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidJavaPlugin.kt index 1eafd03..df17792 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidJavaPlugin.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidJavaPlugin.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidPlugin.kt b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidPlugin.kt index 7fabbb6..0717aed 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidPlugin.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidPlugin.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidShadowPlugin.kt b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidShadowPlugin.kt index e4fe95f..06d62c4 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidShadowPlugin.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/plugin/ToxopidShadowPlugin.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/spec/ModDependency.kt b/src/main/kotlin/com/xpdustry/toxopid/spec/ModDependency.kt index 1e2a57d..0a8fd02 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/spec/ModDependency.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/spec/ModDependency.kt @@ -1,3 +1,28 @@ +/* + * This file is part of Toxopid, a Gradle plugin for Mindustry mods/plugins. + * + * MIT License + * + * Copyright (c) 2024 Xpdustry + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ package com.xpdustry.toxopid.spec import kotlinx.serialization.KSerializer diff --git a/src/main/kotlin/com/xpdustry/toxopid/spec/ModMetadata.kt b/src/main/kotlin/com/xpdustry/toxopid/spec/ModMetadata.kt index 2085021..ca00105 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/spec/ModMetadata.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/spec/ModMetadata.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/spec/ModPlatform.kt b/src/main/kotlin/com/xpdustry/toxopid/spec/ModPlatform.kt index 9a524c1..e942946 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/spec/ModPlatform.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/spec/ModPlatform.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/task/GithubAssetDownload.kt b/src/main/kotlin/com/xpdustry/toxopid/task/GithubAssetDownload.kt index 9b1eb87..b9aa00e 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/task/GithubAssetDownload.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/task/GithubAssetDownload.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/kotlin/com/xpdustry/toxopid/task/MindustryExec.kt b/src/main/kotlin/com/xpdustry/toxopid/task/MindustryExec.kt index e66e759..dcd05b1 100644 --- a/src/main/kotlin/com/xpdustry/toxopid/task/MindustryExec.kt +++ b/src/main/kotlin/com/xpdustry/toxopid/task/MindustryExec.kt @@ -3,7 +3,7 @@ * * MIT License * - * Copyright (c) 2023 Xpdustry + * Copyright (c) 2024 Xpdustry * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal