diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b3435e..c428712 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,2 @@ -image: gradle:jdk17 - -variables: - GRADLE_OPTS: "-Dorg.gradle.daemon=false" - -before_script: - - export GRADLE_USER_HOME=`pwd`/.gradle - -build_test: - stage: deploy - script: - - gradle --build-cache build - - cp build/libs/* ./ - - mv *-dev.jar dev.zip - - mv *.jar latest.jar - - mv dev.zip latest-dev.jar - artifacts: - paths: - - build/libs - - latest.jar - - latest-dev.jar +include: + - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml' diff --git a/build.gradle b/build.gradle index 7d3a275..b319586 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1 @@ -apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle" - -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" -} +apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 85caeee..cc87bd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,9 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -# Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.17.1 -yarn_mappings=build.63 -loader_version=0.12.5 +minecraft_version=1.18 +yarn_mappings=build.1 +loader_version=0.12.6 # Mod Properties -mod_version=1.3 maven_group=io.gitlab.jfronny -archives_base_name=YesCheat - -modrinth_id= -modrinth_required_dependencies= -modrinth_optional_dependencies= -curseforge_id=none -curseforge_required_dependencies= -curseforge_optional_dependencies= +archives_base_name=YesCheat \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists