diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf5d82c..aa55379 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,11 +6,21 @@ variables: before_script: - export GRADLE_USER_HOME=`pwd`/.gradle -deploy: +build_test: stage: deploy - script: gradle --build-cache assemble + script: + - gradle --build-cache assemble + - cp build/libs/* ./ + - rm *-dev.jar + - mv *.jar latest.jar artifacts: paths: - build/libs + - latest.jar only: - master + +modrinth: + stage: deploy + when: manual + script: gradle --build-cache publishModrinth \ No newline at end of file diff --git a/build.gradle b/build.gradle index 495039b..d5ef28a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' + id "com.modrinth.minotaur" version "1.1.0" } sourceCompatibility = JavaVersion.VERSION_1_8 @@ -21,16 +22,16 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. - modApi "me.sargunvohra.mcmods:autoconfig1u:3.2.0-unstable" - include "me.sargunvohra.mcmods:autoconfig1u:3.2.0-unstable" - modApi ("me.shedaniel.cloth:config-2:4.7.0-unstable") { - transitive = false + modApi "me.sargunvohra.mcmods:autoconfig1u:3.3.1" + include "me.sargunvohra.mcmods:autoconfig1u:3.3.1" + modApi ("me.shedaniel.cloth:config-2:4.8.3") { + exclude(group: "net.fabricmc.fabric-api") } - include ("me.shedaniel.cloth:config-2:4.7.0-unstable") { - transitive = false + include ("me.shedaniel.cloth:config-2:4.8.3") { + exclude(group: "net.fabricmc.fabric-api") } - modImplementation "io.github.prospector:modmenu:1.14.6+build.31" + modImplementation "io.github.prospector:modmenu:1.14.13+build.22" } @@ -66,23 +67,18 @@ jar { from "LICENSE" } -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } - } +import com.modrinth.minotaur.TaskModrinthUpload - // select the repositories you want to publish to - repositories { - // uncomment to publish to the local maven - // mavenLocal() +task publishModrinth (type: TaskModrinthUpload){ + token = System.getenv("MODRINTH_API_TOKEN") // Use an environment property! + projectId = '387LWVd9' + versionNumber = "${project.mod_version}" + uploadFile = remapJar // This is the java jar task + addGameVersion("${project.minecraft_version}") + addLoader('fabric') + versionName = "[${project.minecraft_version}] ${project.mod_version}" + afterEvaluate { + tasks.publishModrinth.dependsOn(remapJar) + tasks.publishModrinth.dependsOn(sourcesJar) } } diff --git a/gradle.properties b/gradle.properties index 8fa5591..9ec8f94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,11 @@ -# Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx3G # Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.16.2 -yarn_mappings=1.16.2+build.26 -loader_version=0.9.2+build.206 +minecraft_version=1.16.4 +yarn_mappings=1.16.4+build.7 +loader_version=0.10.8 # Mod Properties -mod_version=1.0 +mod_version=1.1 maven_group=io.gitlab.jfronny archives_base_name=versionchanger # Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.19.0+build.398-1.16 +fabric_version=0.28.0+1.16