From fdf165e6e3681d665c2462bd76846cf81e1cbfcf Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 7 Oct 2022 16:03:38 +0200 Subject: [PATCH] Move to common io.gitlab.jfronny.scripts namespace --- .../gitlab/jfronny/{convention/ext => scripts}/JGitExt.kt | 2 +- .../jfronny/{convention/ext => scripts}/SharedProps.kt | 3 +-- .../gitlab/jfronny/{convention => scripts}/VersionType.kt | 2 +- convention/src/main/kotlin/jf.autoversion.gradle.kts | 3 +-- .../jfronny/{jfmod/ext => scripts}/CurseGradleExt.kt | 2 +- jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts | 4 +--- jfmod/src/main/kotlin/jfmod.gradle.kts | 3 +-- jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts | 3 +-- lom/build.gradle.kts | 2 +- .../io/gitlab/jfronny/{lom/ext => scripts}/GradleExt.kt | 4 +--- .../io/gitlab/jfronny/{lom => scripts}/LomExtension.kt | 2 +- .../kotlin/io/gitlab/jfronny/{lom => scripts}/LomPlugin.kt | 7 +------ .../io/gitlab/jfronny/{lom/ext => scripts}/LoomExt.kt | 4 +--- .../io/gitlab/jfronny/{lom/ext => scripts}/ShadowExt.kt | 2 +- 14 files changed, 14 insertions(+), 29 deletions(-) rename convention/src/main/kotlin/io/gitlab/jfronny/{convention/ext => scripts}/JGitExt.kt (98%) rename convention/src/main/kotlin/io/gitlab/jfronny/{convention/ext => scripts}/SharedProps.kt (92%) rename convention/src/main/kotlin/io/gitlab/jfronny/{convention => scripts}/VersionType.kt (85%) rename jfmod/src/main/kotlin/io/gitlab/jfronny/{jfmod/ext => scripts}/CurseGradleExt.kt (96%) rename lom/src/main/kotlin/io/gitlab/jfronny/{lom/ext => scripts}/GradleExt.kt (95%) rename lom/src/main/kotlin/io/gitlab/jfronny/{lom => scripts}/LomExtension.kt (94%) rename lom/src/main/kotlin/io/gitlab/jfronny/{lom => scripts}/LomPlugin.kt (95%) rename lom/src/main/kotlin/io/gitlab/jfronny/{lom/ext => scripts}/LoomExt.kt (94%) rename lom/src/main/kotlin/io/gitlab/jfronny/{lom/ext => scripts}/ShadowExt.kt (93%) diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/convention/ext/JGitExt.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/JGitExt.kt similarity index 98% rename from convention/src/main/kotlin/io/gitlab/jfronny/convention/ext/JGitExt.kt rename to convention/src/main/kotlin/io/gitlab/jfronny/scripts/JGitExt.kt index b9e643e..a96a5aa 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/convention/ext/JGitExt.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/JGitExt.kt @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.convention.ext +package io.gitlab.jfronny.scripts import org.eclipse.jgit.api.Git import org.eclipse.jgit.errors.IncorrectObjectTypeException diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/convention/ext/SharedProps.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt similarity index 92% rename from convention/src/main/kotlin/io/gitlab/jfronny/convention/ext/SharedProps.kt rename to convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt index 1a40594..97a5b69 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/convention/ext/SharedProps.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt @@ -1,6 +1,5 @@ -package io.gitlab.jfronny.convention.ext +package io.gitlab.jfronny.scripts -import io.gitlab.jfronny.convention.VersionType import org.gradle.api.DefaultTask import org.gradle.api.Project import org.gradle.api.Task diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/convention/VersionType.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt similarity index 85% rename from convention/src/main/kotlin/io/gitlab/jfronny/convention/VersionType.kt rename to convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt index 774ba56..186a995 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/convention/VersionType.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/VersionType.kt @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.convention +package io.gitlab.jfronny.scripts enum class VersionType(val displayName: String, val curseforgeName: String, val modrinthName: String) { RELEASE("Release", "release", "release"), diff --git a/convention/src/main/kotlin/jf.autoversion.gradle.kts b/convention/src/main/kotlin/jf.autoversion.gradle.kts index 3ef0229..89f62f3 100644 --- a/convention/src/main/kotlin/jf.autoversion.gradle.kts +++ b/convention/src/main/kotlin/jf.autoversion.gradle.kts @@ -1,5 +1,4 @@ -import io.gitlab.jfronny.convention.* -import io.gitlab.jfronny.convention.ext.* +import io.gitlab.jfronny.scripts.* import org.eclipse.jgit.api.Git import java.awt.Toolkit import java.awt.datatransfer.StringSelection diff --git a/jfmod/src/main/kotlin/io/gitlab/jfronny/jfmod/ext/CurseGradleExt.kt b/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/CurseGradleExt.kt similarity index 96% rename from jfmod/src/main/kotlin/io/gitlab/jfronny/jfmod/ext/CurseGradleExt.kt rename to jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/CurseGradleExt.kt index 6a81dcc..5a7fdc7 100644 --- a/jfmod/src/main/kotlin/io/gitlab/jfronny/jfmod/ext/CurseGradleExt.kt +++ b/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/CurseGradleExt.kt @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.jfmod.ext +package io.gitlab.jfronny.scripts import com.matthewprenger.cursegradle.CurseExtension import com.matthewprenger.cursegradle.CurseProject diff --git a/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts b/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts index 1f2a5c5..95d13ad 100644 --- a/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts @@ -1,6 +1,4 @@ -import io.gitlab.jfronny.convention.ext.* -import io.gitlab.jfronny.jfmod.ext.* -import io.gitlab.jfronny.lom.ext.* +import io.gitlab.jfronny.scripts.* plugins { id("jfmod") diff --git a/jfmod/src/main/kotlin/jfmod.gradle.kts b/jfmod/src/main/kotlin/jfmod.gradle.kts index ba48c5b..5e58cad 100644 --- a/jfmod/src/main/kotlin/jfmod.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.gradle.kts @@ -1,5 +1,4 @@ -import io.gitlab.jfronny.convention.ext.* -import io.gitlab.jfronny.lom.ext.* +import io.gitlab.jfronny.scripts.* plugins { id("jf.autoversion") diff --git a/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts b/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts index 04395fa..ecc8382 100644 --- a/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts @@ -1,5 +1,4 @@ -import io.gitlab.jfronny.convention.ext.* -import io.gitlab.jfronny.lom.ext.* +import io.gitlab.jfronny.scripts.* plugins { id("jfmod") diff --git a/lom/build.gradle.kts b/lom/build.gradle.kts index 87249b6..da55e29 100644 --- a/lom/build.gradle.kts +++ b/lom/build.gradle.kts @@ -7,7 +7,7 @@ gradlePlugin { plugins { create("lom") { id = "lom" - implementationClass = "io.gitlab.jfronny.lom.LomPlugin" + implementationClass = "io.gitlab.jfronny.scripts.LomPlugin" } } } diff --git a/lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/GradleExt.kt b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/GradleExt.kt similarity index 95% rename from lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/GradleExt.kt rename to lom/src/main/kotlin/io/gitlab/jfronny/scripts/GradleExt.kt index 253f0d2..978940f 100644 --- a/lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/GradleExt.kt +++ b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/GradleExt.kt @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.lom.ext +package io.gitlab.jfronny.scripts import org.gradle.api.Action import org.gradle.api.DefaultTask @@ -13,8 +13,6 @@ import org.gradle.api.tasks.SourceSetContainer import org.gradle.api.tasks.TaskContainer import org.gradle.api.tasks.bundling.Jar import org.gradle.kotlin.dsl.named -import org.gradle.kotlin.dsl.project -import org.gradle.kotlin.dsl.support.delegates.ProjectDelegate import org.gradle.language.jvm.tasks.ProcessResources import kotlin.reflect.KClass import kotlin.reflect.KProperty diff --git a/lom/src/main/kotlin/io/gitlab/jfronny/lom/LomExtension.kt b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomExtension.kt similarity index 94% rename from lom/src/main/kotlin/io/gitlab/jfronny/lom/LomExtension.kt rename to lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomExtension.kt index 6e67f9e..22f77ac 100644 --- a/lom/src/main/kotlin/io/gitlab/jfronny/lom/LomExtension.kt +++ b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomExtension.kt @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.lom +package io.gitlab.jfronny.scripts import net.fabricmc.loom.LoomGradleExtension import org.gradle.api.Project diff --git a/lom/src/main/kotlin/io/gitlab/jfronny/lom/LomPlugin.kt b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomPlugin.kt similarity index 95% rename from lom/src/main/kotlin/io/gitlab/jfronny/lom/LomPlugin.kt rename to lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomPlugin.kt index c46e46f..8b8e653 100644 --- a/lom/src/main/kotlin/io/gitlab/jfronny/lom/LomPlugin.kt +++ b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LomPlugin.kt @@ -1,10 +1,5 @@ -package io.gitlab.jfronny.lom +package io.gitlab.jfronny.scripts -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import io.gitlab.jfronny.convention.ext.deployDebug -import io.gitlab.jfronny.convention.ext.versionS -import io.gitlab.jfronny.lom.ext.* -import io.gitlab.jfronny.lom.ext.registering import net.fabricmc.loom.task.PrepareJarRemapTask import net.fabricmc.loom.task.RemapJarTask import org.gradle.api.Plugin diff --git a/lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/LoomExt.kt b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoomExt.kt similarity index 94% rename from lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/LoomExt.kt rename to lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoomExt.kt index 5ceeb58..ba8b58c 100644 --- a/lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/LoomExt.kt +++ b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/LoomExt.kt @@ -1,8 +1,6 @@ -package io.gitlab.jfronny.lom.ext +package io.gitlab.jfronny.scripts import net.fabricmc.loom.api.LoomGradleExtensionAPI -import net.fabricmc.loom.task.GenerateSourcesTask -import net.fabricmc.loom.task.PrepareJarRemapTask import net.fabricmc.loom.task.RemapJarTask import net.fabricmc.loom.task.RemapSourcesJarTask import net.fabricmc.loom.task.UnpickJarTask diff --git a/lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/ShadowExt.kt b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/ShadowExt.kt similarity index 93% rename from lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/ShadowExt.kt rename to lom/src/main/kotlin/io/gitlab/jfronny/scripts/ShadowExt.kt index 9c134b4..43fcc36 100644 --- a/lom/src/main/kotlin/io/gitlab/jfronny/lom/ext/ShadowExt.kt +++ b/lom/src/main/kotlin/io/gitlab/jfronny/scripts/ShadowExt.kt @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.lom.ext +package io.gitlab.jfronny.scripts import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.artifacts.Configuration