Buildscript tweaks

- Move Flywheel version to gradle.properties
- Use implementation instead of compile
This commit is contained in:
PepperBell 2021-06-23 12:30:10 -07:00
parent c9d95e83ae
commit c9f9be73ff
2 changed files with 16 additions and 16 deletions

View file

@ -90,28 +90,27 @@ mixin {
repositories { repositories {
maven { maven {
// location of the maven that hosts JEI files (And TiC) // Location of the maven that hosts JEI files (and TiC)
name = "Progwml6 maven" name = "Progwml6 maven"
url = "https://dvs1.progwml6.com/files/maven/" url = "https://dvs1.progwml6.com/files/maven/"
} }
/* /*maven {
maven { // Location of a maven mirror for JEI files, as a fallback
// location of a maven mirror for JEI files, as a fallback
name = "ModMaven" name = "ModMaven"
url = "https://modmaven.k-4u.nl" url = "https://modmaven.k-4u.nl"
}*/ }*/
maven { maven {
//location of the maven for vazkii's mods // Location of the maven for vazkii's mods
name = "blamejared" name = "blamejared"
url = "http://maven.blamejared.com/" url = "http://maven.blamejared.com/"
} }
maven { maven {
//location of the maven for mixed mappings and registrate // Location of the maven for mixed mappings, Registrate, and Flywheel
name "tterrag maven" name = "tterrag maven"
url "https://maven.tterrag.com/" url = "https://maven.tterrag.com/"
} }
maven { maven {
url "https://www.cursemaven.com" url = "https://www.cursemaven.com"
content { content {
includeGroup "curse.maven" includeGroup "curse.maven"
} }
@ -129,17 +128,17 @@ dependencies {
implementation fg.deobf(registrate) implementation fg.deobf(registrate)
shade registrate shade registrate
// compile against the JEI API but do not include it at runtime
compileOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}:api")
// at runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
if (findProject(':Flywheel') != null) { if (findProject(':Flywheel') != null) {
compile project(':Flywheel') // jozu: I use a gradle workspace with both projects implementation project(':Flywheel') // jozu: I use a gradle workspace with both projects
} else { } else {
compile fg.deobf("com.jozufozu.flywheel:Flywheel:1.16-0.0.2.8") implementation fg.deobf("com.jozufozu.flywheel:Flywheel:${flywheel_version}")
} }
// Compile against the JEI API but do not include it at runtime
compileOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}:api")
// At runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:${jei_version}")
// implementation fg.deobf("curse.maven:druidcraft-340991:3101903") // implementation fg.deobf("curse.maven:druidcraft-340991:3101903")
// i'll leave this here commented for easier testing // i'll leave this here commented for easier testing

View file

@ -16,6 +16,7 @@ cursegradle_version = 1.4.0
# dependency versions # dependency versions
registrate_version = 1.0.4 registrate_version = 1.0.4
flywheel_version = 1.16-0.0.2.8
jei_version = 7.7.0.106 jei_version = 7.7.0.106
# curseforge information # curseforge information