Skip to content

Commit

Permalink
wip: bump versions ready for 1.20.5
Browse files Browse the repository at this point in the history
- Neoforge builds temporarily disabled
- Code not yet updated
- Bumped Gradle & JDK to 8.5 & 21
- Source/target compatibility still set to 17
  • Loading branch information
MattSturgeon committed Apr 21, 2024
1 parent 49bbebf commit dbaacc8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ import org.jetbrains.changelog.tasks.BaseChangelogTask

plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
id "com.hypherionmc.modutils.modpublisher" version "2.0.5" apply false
id "com.github.johnrengelman.shadow" version "7.1.2" apply false
id "com.github.johnrengelman.shadow" version "8.1.1" apply false
id "org.jetbrains.changelog" version "2.2.0"
}

tasks.named('wrapper') {
// Use "all" so we get sources and javadoc too
distributionType = "all"
gradleVersion = "8.6"
}

// Helper task that bumps the version number
Expand Down Expand Up @@ -101,7 +102,7 @@ allprojects {
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.release = 17
options.release = 21
}

java {
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@ release_type=release
# https://maven.parchmentmc.org/org/parchmentmc/data
# Forge dependencies use maven's version range spec:
# https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
minecraft_version=1.20.4
parchment_version=1.20.2-2023.12.10
minecraft_version=1.20.5-rc2
parchment_version=1.20.4-2024.02.25
supported_mc_versions=

fabric_loader_version=0.15.3
fabric_api_version=0.91.2+1.20.4
fabric_loader_version=0.15.10
fabric_api_version=0.97.3+1.20.5
fabric_loader_req=>=0.12.11
fabric_mc_req=~1.20.4
fabric_mc_req=~1.20.5
fabric_supported_mc_versions=

neoforge_version=20.4.60-beta
neoforge_mc_req=[1.20.4,)
neoforge_mc_req=[1.20.5,)
neoforge_loader_req=[1,)
neoforge_req=[20,)
neoforge_supported_mc_versions=

# Other dependencies
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
# https://mvnrepository.com/artifact/me.shedaniel.cloth/cloth-config?repo=architectury
modmenu_version=9.0.0-pre.1
cloth_version=13.0.114
modmenu_version=10.0.0-alpha.3
cloth_version=14.0.125
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pluginManagement {

include("common")
include("fabric")
include("neoforge")
//include("neoforge")
include("metadata")
include("variant", "variant:api", "variant:normal", "variant:modrinth")

Expand Down

0 comments on commit dbaacc8

Please sign in to comment.