Skip to content

Commit

Permalink
Update gradle to 7.2, update deps, and bump min CrT version. Also swi…
Browse files Browse the repository at this point in the history
…tch to using parchment
  • Loading branch information
pupnewfster committed Oct 2, 2021
1 parent 053506e commit 2e0595d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .lgtm.yml
Expand Up @@ -6,4 +6,4 @@ extraction:
index:
java_version: 8
gradle:
version: 7.1
version: 7.2
8 changes: 7 additions & 1 deletion build.gradle
Expand Up @@ -12,9 +12,14 @@ buildscript {
name "forge"
url "https://maven.minecraftforge.net/"
}
maven {
name 'parchment'
url 'https://maven.parchmentmc.org'
}
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath 'org.parchmentmc:librarian:1.+'
}
}

Expand All @@ -28,10 +33,11 @@ plugins {
}

apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'

wrapper {
//Define wrapper values here so as to not have to always do so when updating gradlew.properties
gradleVersion = '7.1.1'
gradleVersion = '7.2'
distributionType = Wrapper.DistributionType.ALL
}

Expand Down
28 changes: 14 additions & 14 deletions gradle.properties
Expand Up @@ -3,8 +3,8 @@
org.gradle.jvmargs=-Xmx3G

minecraft_version=1.16.5
mappings_version=2021-03-13-1.16.5
mappings_channel=mojmapwithdoc
mappings_version=2021.08.29-1.16.5
mappings_channel=parchment
loader_version_range=[36,)
forge_version=36.2.2
mod_version=10.0.21
Expand All @@ -19,34 +19,34 @@ curse_release_type=release
# Only bump them whenever we need access to a feature that is not available in earlier versions
# Currently No min versions for optional dependencies

jb_annotations=21.0.1
jb_annotations=22.0.0

#JUnit/Testing dependencies
junit_version=5.7.2
junit_version=5.8.1
quicktheories_version=0.26

#Mod dependencies
computer_craft_version=1.98.1
crafttweaker_version=7.1.0.367
computer_craft_version=1.98.2
crafttweaker_version=7.1.2.445
ctm_version=1.1.1.5
curios_version=1.16.5-4.0.5.2
curios_version=1.16.5-4.0.5.3
flux_networks_id=3285556
jade_api_id=3389762
jade_id=3389760
jei_version=7.7.1.117
jeitweaker_version=1.0.1.34
jade_api_id=3467446
jade_id=3467445
jei_version=7.7.1.121
jeitweaker_version=1.0.1.35
projecte_api_id=3223223
top_version=1.16-3.1.4-22

#Mod dependency min version ranges
jei_version_range=[7.7.1.117,)
crafttweaker_version_range=[7.1.0.329,)
crafttweaker_version_range=[7.1.2.445,)

#Mod dependencies for recipes (only used by our data generators)
ae2_version=8.4.0
ae2_version=8.4.1
biomesoplenty_api_id=3407192
biomesoplenty_id=3407189
byg_id=3409287
byg_id=3444476
ilikewood_id=3285752
ilikewood_bop_id=3285758
ilikewood_byg_id=3286762
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 2e0595d

Please sign in to comment.