Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.17 and rework Autoconfig to use Jankson #70

Draft
wants to merge 4 commits into
base: 1.16-fabric
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 16 additions & 25 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,27 @@ import com.modrinth.minotaur.TaskModrinthUpload

plugins {
id "java-library"
id "fabric-loom" version "0.5-SNAPSHOT"
id "fabric-loom" version "0.9.+"
id "com.matthewprenger.cursegradle" version "1.4.0"
id "com.modrinth.minotaur" version "1.1.0"
id "com.modrinth.minotaur" version "1.2.1"
id "org.cadixdev.licenser" version "0.6.1"
}

ext {
commonGradleBranch = "master"
minecraftVersion = "1.16.5"
yarnMappings = "1.16.5+build.1"
loaderVersion = "0.11.1"
fabricAPIVersion = "0.29.3+1.16"
modMenuVersion = "1.14.13+build.19"
clothConfigVersion = "4.8.3"
minecraftVersion = "1.17.1"
yarnMappings = "1.17.1+build.40"
loaderVersion = "0.11.6"
fabricAPIVersion = "0.37.0+1.17"
clothConfigVersion = "5.0.34"
modMenuVersion = "2.0.2"
autoConfigVersion = "3.3.1"
autoConfigTOMLVersion = "autoconfig-3.x.x-fabric-SNAPSHOT"
}

version = "2.0.6-fabric"
version = "2.1.0-fabric"
group = "com.therandomlabs.vanilladeathchest"
archivesBaseName = "vanilladeathchest"

apply from: "https://raw.githubusercontent.com/TheRandomLabs/Common-Gradle/${project.commonGradleBranch}/fabric.gradle"
apply from: "https://raw.githubusercontent.com/jhbuchanan45/Common-Gradle/main/fabric.gradle"

if (project.hasProperty("curseForgeAPIKey")) {
curseforge {
Expand All @@ -33,14 +32,9 @@ if (project.hasProperty("curseForgeAPIKey")) {
id = "393000"

addGameVersion "Fabric"
addGameVersion "Java 10"
addGameVersion "Java 9"
addGameVersion "Java 8"
addGameVersion "1.16.5"
addGameVersion "1.16.4"
addGameVersion "1.16.3"
addGameVersion "1.16.2"
addGameVersion "1.16.1"
addGameVersion "Java 16"
addGameVersion "1.17.0"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be

addGameVersion "1.17.1"
addGameVersion "1.17"

instead of 1.17.0

addGameVersion "1.17.1"

mainArtifact(remapJar) {
changelogType = "markdown"
Expand Down Expand Up @@ -83,11 +77,8 @@ if (project.hasProperty("modrinthToken")) {
changelog = new File("changelog.md").getText()
uploadFile = remapJar
releaseType = "alpha"
addGameVersion("1.16.5")
addGameVersion("1.16.4")
addGameVersion("1.16.3")
addGameVersion("1.16.2")
addGameVersion("1.16.1")
addGameVersion("1.17.0")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too, see above

addGameVersion("1.17.1")
addLoader("fabric")
addFile(sourcesJar)
addFile(javadocJar)
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading