Skip to content

Commit 12679db

Browse files
committed
Fix gradle build (#2139)
* Fix gradle build * Add output folder to .gitignore
1 parent 181ba71 commit 12679db

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ out
1515

1616
# gradle
1717
build
18+
output
1819
.gradle
1920

2021
# other

build.gradle

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
repositories {
33
mavenCentral()
44
jcenter()
5-
maven { name = 'forge'; url = "http://files.minecraftforge.net/maven" }
5+
maven { name = 'forge'; url = "https://files.minecraftforge.net/maven" }
66
maven {
77
name = "sonatype"
88
url = "https://oss.sonatype.org/content/repositories/snapshots/"
@@ -24,9 +24,12 @@ apply plugin: 'java'
2424
apply plugin: 'net.minecraftforge.gradle.forge'
2525

2626
group= "zmaster587.advancedRocketry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
27-
archivesBaseName = "AdvancedRocketry"
28-
sourceCompatibility = 8
29-
targetCompatibility = 8
27+
archivesBaseName = project.archivebase
28+
29+
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
30+
compileJava {
31+
sourceCompatibility = targetCompatibility = '1.8'
32+
}
3033

3134
jar {
3235
manifest {
@@ -40,12 +43,11 @@ minecraft {
4043
version = "1.12.2-14.23.4.2739"
4144
runDir = "run"
4245
mappings = "snapshot_20170624"
43-
sourceCompatibility = 1.8
44-
targetCompatibility = 1.8
46+
4547
replaceIn "src/main/java/zmaster587/advancedRocketry/AdvancedRocketry.java"
46-
replace "@MAJOR@", version_major
47-
replace "@MINOR@", version_minor
48-
replace "@REVIS@", version_revis
48+
replace "@MAJOR@", project.version_major
49+
replace "@MINOR@", project.version_minor
50+
replace "@REVIS@", project.version_revis
4951
replace "@BUILD@", project.getBuildNumber()
5052

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

5860
processResources
5961
{
62+
includeEmptyDirs = false
63+
6064
// this will ensure that this task is redone when the versions change.
6165
inputs.property "version", project.version
6266
inputs.property "mcversion", project.minecraft.version
@@ -106,10 +110,10 @@ curseforge{
106110
releaseType = "beta"
107111
addGameVersion minecraft.version
108112
mainArtifact(jar) {
109-
displayName = "AdvancedRocketry ${project.version} build " + project.getBuildNumber() + " for " + minecraft.version
113+
displayName = "AdvancedRocketry ${project.version} build " + project.getBuildNumber() + " for " + minecraft.version
110114
}
111115
addArtifact (deobfJar){
112-
displayName = "AdvancedRocketry ${project.version}-deobf build " + project.getBuildNumber() + " for " + minecraft.version
116+
displayName = "AdvancedRocketry ${project.version}-deobf build " + project.getBuildNumber() + " for " + minecraft.version
113117
}
114118
}
115119
}

gradle/scripts/deps.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,17 @@ repositories {
3737
}
3838

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

4646

4747
// compile against the JEI API but do not include it at runtime
48-
compileOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}:api")
48+
deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api"
49+
//compileOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}:api") //for ForgeGradle 3
4950
// at runtime, use the full JEI jar
50-
runtimeOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}")
51+
runtime "mezz.jei:jei_${mcversion}:${jei_version}"
52+
//runtimeOnly fg.deobf("mezz.jei:jei_${mcversion}:${jei_version}") //for ForgeGradle 3
5153
}

0 commit comments

Comments
 (0)