mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-18 11:48:02 -04:00
Switched to Gradle 5 version on Minecraft 1.7.10
Using a fork of ForgeGradle for that which updates it to that version.
This commit is contained in:
Vexatos
payonel
parent
36b9ba06d7
commit
e452b1fb5e
95
build.gradle
95
build.gradle
@ -9,20 +9,21 @@ buildscript {
|
|||||||
name = "sonatype"
|
name = "sonatype"
|
||||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||||
}
|
}
|
||||||
|
maven {
|
||||||
|
url = "https://jitpack.io"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
classpath 'com.github.CDAGaming:ForgeGradle:1c670759c5'
|
||||||
|
classpath 'com.github.CDAGaming:CurseGradle:184e4322fd'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "com.matthewprenger.cursegradle" version "1.0.9"
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'scala'
|
apply plugin: 'scala'
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
apply plugin: 'com.matthewprenger.cursegradle'
|
||||||
|
|
||||||
file "build.properties" withReader {
|
file "build.properties" withReader {
|
||||||
def prop = new Properties()
|
def prop = new Properties()
|
||||||
@ -77,53 +78,61 @@ repositories {
|
|||||||
name = "mightypirates"
|
name = "mightypirates"
|
||||||
url = "https://maven.cil.li/"
|
url = "https://maven.cil.li/"
|
||||||
}
|
}
|
||||||
|
// These are necessary because some parts of the maven repo is weirdly structured, this needs to be fixed.
|
||||||
|
ivy {
|
||||||
|
name 'weird maven repos'
|
||||||
|
artifactPattern "https://maven.cil.li/[module]/[revision]/[module]-[revision].[ext]"
|
||||||
|
}
|
||||||
|
ivy {
|
||||||
|
name 'weird maven repos 2'
|
||||||
|
artifactPattern "https://maven.cil.li/[module]/[revision]/[module]-[revision]-[classifier].[ext]"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
provided
|
|
||||||
embedded
|
embedded
|
||||||
compile.extendsFrom embedded
|
implementation.extendsFrom embedded
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
provided "appeng:RotaryCraft:${config.rotc.version}:api"
|
compileOnly "appeng:RotaryCraft:${config.rotc.version}:api"
|
||||||
provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
|
compileOnly ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
|
||||||
exclude module: 'buildcraft'
|
exclude module: 'buildcraft'
|
||||||
}
|
}
|
||||||
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
|
compileOnly "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
|
||||||
provided "codechicken:EnderStorage:${config.minecraft.version}-${config.es.version}:dev"
|
compileOnly "codechicken:EnderStorage:${config.minecraft.version}-${config.es.version}:dev"
|
||||||
provided "codechicken:ForgeMultipart:${config.minecraft.version}-${config.fmp.version}:dev"
|
compileOnly "codechicken:ForgeMultipart:${config.minecraft.version}-${config.fmp.version}:dev"
|
||||||
provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
|
compileOnly "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
|
||||||
provided "codechicken:WR-CBE:${config.minecraft.version}-${config.wrcbe.version}:dev"
|
compileOnly "codechicken:WR-CBE:${config.minecraft.version}-${config.wrcbe.version}:dev"
|
||||||
provided "com.bluepowermod:BluePower:${config.bluepower.version}:deobf"
|
compileOnly "com.bluepowermod:BluePower:${config.bluepower.version}:deobf"
|
||||||
provided "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev"
|
compileOnly "com.gregoriust.gregtech:gregtech_${config.minecraft.version}:${config.gt.version}:dev"
|
||||||
provided "igwmod:IGW-Mod-1.7.10:${config.igwmod.version}:userdev"
|
compileOnly "igwmod:IGW-Mod-1.7.10:${config.igwmod.version}:userdev"
|
||||||
provided "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
|
compileOnly "li.cil.tis3d:TIS-3D:${config.tis3d.version}:dev"
|
||||||
provided "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev"
|
compileOnly "mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}:dev"
|
||||||
provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
|
compileOnly "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
|
||||||
provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
|
compileOnly "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
|
||||||
provided "dev.modwarriors.notenoughkeys:NotEnoughKeys:${config.minecraft.version}-${config.nek.version}:deobf-dev"
|
compileOnly "dev.modwarriors.notenoughkeys:NotEnoughKeys:${config.minecraft.version}-${config.nek.version}:deobf-dev"
|
||||||
provided "qmunity:QmunityLib:${config.qmunitylib.version}:deobf"
|
compileOnly "qmunity:QmunityLib:${config.qmunitylib.version}:deobf"
|
||||||
provided "tmech:TMechworks:${config.minecraft.version}-${config.tmech.version}:deobf"
|
compileOnly "tmech:TMechworks:${config.minecraft.version}-${config.tmech.version}:deobf"
|
||||||
provided ("mrtjp:ProjectRed:${config.projred.version}:dev") {
|
compileOnly ("mrtjp:ProjectRed:${config.projred.version}:dev") {
|
||||||
exclude module: 'CoFHCore'
|
exclude module: 'CoFHCore'
|
||||||
}
|
}
|
||||||
// provided "coloredlightscore:ColoredLightsCore:${config.coloredlights.version}:api"
|
// compileOnly "coloredlightscore:ColoredLightsCore:${config.coloredlights.version}:api"
|
||||||
|
|
||||||
provided name: 'buildcraft', version: config.bc.version, classifier: "dev", ext: 'jar'
|
compileOnly name: 'buildcraft', version: config.bc.version, classifier: "dev", ext: 'jar'
|
||||||
provided name: 'GalacticraftCoreAll', version: config.gc.version, ext: 'jar'
|
compileOnly name: 'GalacticraftCoreAll', version: config.gc.version, ext: 'jar'
|
||||||
provided name: 'MekanismAll', version: config.mekanism.version, ext: 'jar'
|
compileOnly name: 'MekanismAll', version: config.mekanism.version, ext: 'jar'
|
||||||
provided name: 'redlogic', version: config.redlogic.version, ext: 'jar'
|
compileOnly name: 'redlogic', version: config.redlogic.version, ext: 'jar'
|
||||||
|
|
||||||
provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
|
compileOnly name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
|
||||||
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
|
compileOnly name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
|
||||||
provided name: 'MineFactoryReloaded', version: config.mfr.version, ext: 'jar'
|
compileOnly name: 'MineFactoryReloaded', version: config.mfr.version, ext: 'jar'
|
||||||
provided name: 'ComputerCraft', version: config.cc.version, ext: 'jar'
|
compileOnly name: 'ComputerCraft', version: config.cc.version, ext: 'jar'
|
||||||
provided name: 'EnderIO', version: config.eio.version, ext: 'jar'
|
compileOnly name: 'EnderIO', version: config.eio.version, ext: 'jar'
|
||||||
provided name: 'Railcraft', version: config.rc.version, ext: 'jar'
|
compileOnly name: 'Railcraft', version: config.rc.version, ext: 'jar'
|
||||||
provided name: 'BloodMagic', version: config.bloodmagic.version, ext: 'jar'
|
compileOnly name: 'BloodMagic', version: config.bloodmagic.version, ext: 'jar'
|
||||||
provided name: 'ExtraCells', version: config.ec.version, ext: 'jar'
|
compileOnly name: 'ExtraCells', version: config.ec.version, ext: 'jar'
|
||||||
provided name: 'ThaumicEnergistics', version: config.thaumicenergistics.version, ext: 'jar'
|
compileOnly name: 'ThaumicEnergistics', version: config.thaumicenergistics.version, ext: 'jar'
|
||||||
|
|
||||||
compile 'com.google.code.findbugs:jsr305:1.3.9' // Annotations used by google libs.
|
compile 'com.google.code.findbugs:jsr305:1.3.9' // Annotations used by google libs.
|
||||||
|
|
||||||
@ -134,13 +143,6 @@ dependencies {
|
|||||||
testCompile "org.scalatest:scalatest_2.11:2.2.6"
|
testCompile "org.scalatest:scalatest_2.11:2.2.6"
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the "provided" dependencies to the compile (but NOT runtime) classpath.
|
|
||||||
sourceSets.main.compileClasspath += [configurations.provided]
|
|
||||||
|
|
||||||
idea.module.scopes.PROVIDED.plus += [configurations.provided]
|
|
||||||
// TODO Causes errors on Gradle 2 for me (No such property: allDependencies for class: java.io.File).
|
|
||||||
//eclipse.classpath.plusConfigurations += [configurations.provided]
|
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "${config.minecraft.version}-${config.forge.version}"
|
version = "${config.minecraft.version}-${config.forge.version}"
|
||||||
|
|
||||||
@ -255,6 +257,7 @@ curseforge {
|
|||||||
changelog = file("changelog.md")
|
changelog = file("changelog.md")
|
||||||
addGameVersion config.minecraft.version
|
addGameVersion config.minecraft.version
|
||||||
addGameVersion "Java 8"
|
addGameVersion "Java 8"
|
||||||
|
mainArtifact jar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user