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 a2317ee..34341b1 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" } repositories { @@ -20,9 +21,8 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-command-api-v1:+" - modImplementation "net.fabricmc.fabric-api:fabric-lifecycle-events-v1:+" - modImplementation "net.fabricmc.fabric-api:fabric-api-base:+" + //Fabric API + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modApi("me.sargunvohra.mcmods:autoconfig1u:3.2.2") { exclude(group: "net.fabricmc.fabric-api") @@ -67,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 = 'v3lfX2LD' + 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 23845ac..759976c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.16.3 -yarn_mappings=1.16.3+build.11 -loader_version=0.9.3+build.207 +minecraft_version=1.16.4 +yarn_mappings=1.16.4+build.7 +loader_version=0.10.8 # Mod Properties mod_version=1.1 maven_group=io.gitlab.jfronny archives_base_name=dynres +#Dependencies +fabric_version=0.28.1+1.16 \ No newline at end of file