Skip to content

Commit

Permalink
Fix gradle build (#2139)
Browse files Browse the repository at this point in the history
* Fix gradle build

* Add output folder to .gitignore
  • Loading branch information
Brycey92 authored Jun 11, 2021
1 parent ed36712 commit 3e30fbf
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ out

# gradle
build
output
.gradle

# other
Expand Down
26 changes: 15 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ buildscript {
repositories {
mavenCentral()
jcenter()
maven { name = 'forge'; url = "http://files.minecraftforge.net/maven" }
maven { name = 'forge'; url = "https://files.minecraftforge.net/maven" }
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
Expand All @@ -24,9 +24,12 @@ apply plugin: 'java'
apply plugin: 'net.minecraftforge.gradle.forge'

group= "zmaster587.advancedRocketry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "AdvancedRocketry"
sourceCompatibility = 8
targetCompatibility = 8
archivesBaseName = project.archivebase

sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
}

jar {
manifest {
Expand All @@ -40,12 +43,11 @@ minecraft {
version = "1.12.2-14.23.4.2739"
runDir = "run"
mappings = "snapshot_20170624"
sourceCompatibility = 1.8
targetCompatibility = 1.8

replaceIn "src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java"
replace "@MAJOR@", version_major
replace "@MINOR@", version_minor
replace "@REVIS@", version_revis
replace "@MAJOR@", project.version_major
replace "@MINOR@", project.version_minor
replace "@REVIS@", project.version_revis
replace "@BUILD@", project.getBuildNumber()

replace "%LIBVULPESVERSION%", project.libVulpesVersion
Expand All @@ -57,6 +59,8 @@ apply from: "gradle/scripts/deps.gradle"

processResources
{
includeEmptyDirs = false

// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
Expand Down Expand Up @@ -106,10 +110,10 @@ curseforge{
releaseType = "beta"
addGameVersion minecraft.version
mainArtifact(jar) {
displayName = "AdvancedRocketry ${project.version} build " + project.getBuildNumber() + " for " + minecraft.version
displayName = "AdvancedRocketry ${project.version} build " + project.getBuildNumber() + " for " + minecraft.version
}
addArtifact (deobfJar){
displayName = "AdvancedRocketry ${project.version}-deobf build " + project.getBuildNumber() + " for " + minecraft.version
displayName = "AdvancedRocketry ${project.version}-deobf build " + project.getBuildNumber() + " for " + minecraft.version
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions gradle/scripts/deps.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,17 @@ repositories {
}

dependencies {
minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2854'
//minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2854' //for ForgeGradle 3
compileOnly name: 'industrialcraft-2', version: '2.7.39-ex111-api', ext: 'jar'
//compile name: 'Tesla', version: '1.11-1.3.0.51-deobf', ext: 'jar'
//compile name: 'EnderIO', version: '1.7.10-2.2.8.381', ext: 'jar'
compileOnly name: 'LibVulpes', version: '1.12.2-' + project.libVulpesVersion + '-' + project.libVulpesBuildNum + '-deobf', ext: 'jar'


// compile against the JEI API but do not include it at runtime
compileOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}:api")
deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api"
//compileOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}:api") //for ForgeGradle 3
// at runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}")
runtime "mezz.jei:jei_${mcversion}:${jei_version}"
//runtimeOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}") //for ForgeGradle 3
}

0 comments on commit 3e30fbf

Please sign in to comment.