From d066fcd8485cae9eb6b5a10b73e5b47ff86a82ae Mon Sep 17 00:00:00 2001
From: JFronny <jo.frohnmeyer@protonmail.com>
Date: Wed, 10 Nov 2021 17:47:22 +0100
Subject: [PATCH] New CI script

---
 .gitlab-ci.yml                     | 23 +++++++++++++++--------
 build.gradle                       |  5 +----
 gradle.properties                  |  1 -
 src/main/resources/fabric.mod.json |  3 +--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d13b2cf..936a066 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gradle:jdk16
+image: gradle:jdk17
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
@@ -6,21 +6,28 @@ variables:
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
+stages:
+  - build
+  - deploy
+
 build_test:
-  stage: deploy
+  stage: build
   script:
-    - gradle --build-cache assemble
+    - gradle --build-cache build publish -PpublicMaven -Ppipeline=$CI_PIPELINE_ID
     - cp build/libs/* ./
-    - rm *-dev.jar
+    - rm *-maven.jar *-sources.jar *-sources-dev.jar
+    - mv *-dev.jar dev.zip
     - mv *.jar latest.jar
+    - mv dev.zip latest-dev.jar
   artifacts:
     paths:
       - build/libs
       - latest.jar
-  only:
-    - master
+      - latest-dev.jar
 
 deploy:
+  rules:
+    - if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/'
   stage: deploy
-  when: manual
-  script: gradle --build-cache publishModrinth curseforge
\ No newline at end of file
+  script:
+    - gradle --build-cache build publish modrinth curseforge -PpublicMaven
diff --git a/build.gradle b/build.gradle
index a02bae3..8eeff93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,12 +16,9 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
     include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
     include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
     include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
 
-    modImplementation "com.terraformersmc:modmenu:2.0.3"
+    modImplementation "com.terraformersmc:modmenu:2.0.7"
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 127a9e1..3bf0cd3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,6 @@ mod_version=1.2.2
 maven_group=io.gitlab.jfronny
 archives_base_name=versionchanger
 # Dependencies
-fabric_version=0.42.1+1.17
 jfapi_version=2.1.3
 
 modrinth_id=387LWVd9
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0a3cfff..9229f11 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -21,8 +21,7 @@
     "versionchanger.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.9.0+build.204",
-    "fabric": "*",
+    "fabricloader": ">=0.12.0",
     "minecraft": "*",
     "libjf-config-v0": ">=2.1.3"
   }