From a730f0c990b91b818ca2a50c995c91625703ece7 Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 25 Nov 2022 17:14:38 +0100 Subject: [PATCH] Update to new infrastructure --- .gitlab-ci.yml | 2 -- .woodpecker.yml | 1 + build.gradle | 12 ------------ build.gradle.kts | 17 +++++++++++++++++ gradle.properties | 8 +++++--- settings.gradle.kts | 13 +++++++++++++ 6 files changed, 36 insertions(+), 17 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100644 .woodpecker.yml delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 settings.gradle.kts diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a121a25..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -include: - - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml' \ No newline at end of file diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..f2c1117 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1 @@ +#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f9b5827..0000000 --- a/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle" - -dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}") - modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${project.libjf_version}") - - // Dev env - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}") - modLocalRuntime("com.terraformersmc:modmenu:4.0.6") -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d225f01 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,17 @@ +import io.gitlab.jfronny.scripts.* + +plugins { + id("jfmod") version "1.2-SNAPSHOT" + id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") +} + +dependencies { + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}") + modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:${prop("libjf_version")}") + + // Dev env + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}") + modLocalRuntime("com.terraformersmc:modmenu:${prop("modmenu_version")}") +} diff --git a/gradle.properties b/gradle.properties index 7ae2491..4184102 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,17 @@ minecraft_version=1.19.2 yarn_mappings=build.8 loader_version=0.14.9 + maven_group=io.gitlab.jfronny archives_base_name=translater -libjf_version=3.0.3 -fabric_version=0.60.0+1.19.2 - modrinth_id=translater modrinth_required_dependencies=libjf modrinth_optional_dependencies=modmenu curseforge_id=394823 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu + +libjf_version=3.2.1 +fabric_version=0.67.1+1.19.2 +modmenu_version=4.1.1 diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..4c80169 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,13 @@ +pluginManagement { + val libjf_version: String by settings + repositories { + maven("https://maven.fabricmc.net/") // FabricMC + maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts + gradlePluginPortal() + } + plugins { + id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") version libjf_version + } +} + +rootProject.name = "translater" \ No newline at end of file