Update buildscript

- Mod compiles now.
- Drop the deobfJar compilation because we now have deobfCompile for deps.
- Temporarily disable creation of sourceJar due to issue with Gradle 2.9 and FG2.1.
- Add a -ss suffix to version to indicate SnapShots
This commit is contained in:
Nick 2015-12-01 21:17:24 -08:00
parent c4e6f63ada
commit 02956798f0

View file

@ -5,15 +5,15 @@ buildscript {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
} }
dependencies { dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'org.ajoberstar:gradle-git:0.10.1' classpath 'org.ajoberstar:gradle-git:0.10.1'
} }
} }
plugins { plugins {
id 'com.matthewprenger.cursegradle' version '1.0.1' id "net.minecraftforge.gradle.forge" version "2.0.2"
id "net.minecraftforge.gradle.forge" version "2.0.2" id 'com.matthewprenger.cursegradle' version '1.0.4'
id 'net.franz-becker.gradle-lombok' version '1.5' id 'net.franz-becker.gradle-lombok' version '1.5'
} }
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
@ -25,9 +25,8 @@ if (System.getenv('BUILD_NUMBER') != null)
group = package_group group = package_group
archivesBaseName = mod_name archivesBaseName = mod_name
version = "${mc_version}-${mod_version}-${build_number}" version = "${mc_version}-${mod_version}-${build_number}-ss"
// Ignore this error. It'll work just fine when building.
import org.ajoberstar.grgit.* import org.ajoberstar.grgit.*
ext.repo = Grgit.open(project.file('.')) ext.repo = Grgit.open(project.file('.'))
@ -47,9 +46,11 @@ dependencies {
minecraft { minecraft {
version = "${mc_version}-${forge_version}" version = "${mc_version}-${forge_version}"
runDir = "run" runDir = "run"
makeObfSourceJar = false // Until #295 gets merged into FG2.1
replace "@VERSION@", project.version replace "@VERSION@", project.version
replaceIn "BloodMagic.java" replaceIn "Constants.java"
replaceIn "BloodMagicAPI.java" replaceIn "BloodMagicAPI.java"
if (project.hasProperty('mappings_version')) if (project.hasProperty('mappings_version'))
@ -73,6 +74,19 @@ processResources {
} }
} }
lombok {
version = "1.16.6"
sha256 = "e0a471be03e1e6b02bf019480cec7a3ac9801702bf7bf62f15d077ad4df8dd5d"
}
import net.franz_becker.gradle.lombok.task.DelombokTask
task delombok(type: DelombokTask) {
args("src/main/java", "-d", "build/sources/delomboked/java")
}
tasks.eclipse.dependsOn installLombok
jar { jar {
classifier = '' classifier = ''
manifest.mainAttributes( manifest.mainAttributes(
@ -84,38 +98,26 @@ jar {
) )
} }
lombok { // API jar
version = "1.16.6" task apiJar(type: Jar) {
sha256 = "e0a471be03e1e6b02bf019480cec7a3ac9801702bf7bf62f15d077ad4df8dd5d" from sourceSets.main.allSource
from sourceSets.main.output
include 'WayofTime/bloodmagic/api/**/*'
classifier = 'api'
} }
// Ignore this one, too
import net.franz_becker.gradle.lombok.task.DelombokTask
task delombok(type: DelombokTask) {
args("src/main/java", "-d", "build/sources/delomboked/java")
}
tasks.eclipse.dependsOn installLombok
// Javadoc jar // Javadoc jar
task javadocJar(type: Jar, dependsOn: javadoc) { task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir from javadoc.destinationDir
classifier = 'javadoc' classifier = 'javadoc'
} }
// Deobfuscated jar
task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}
javadoc { javadoc {
source = projectDir.path + "/build/sources/delomboked/java" source = projectDir.path + "/build/sources/delomboked/java"
} }
tasks.javadoc.dependsOn delombok tasks.javadoc.dependsOn delombok
tasks.build.dependsOn sourceJar, javadocJar tasks.build.dependsOn javadoc, javadocJar, apiJar
tasks.withType(JavaCompile) { task -> tasks.withType(JavaCompile) { task ->
task.options.encoding = 'UTF-8' task.options.encoding = 'UTF-8'
@ -128,6 +130,7 @@ publishing {
artifact jar artifact jar
artifact sourceJar artifact sourceJar
artifact javadocJar artifact javadocJar
artifact apiJar
} }
} }
repositories { repositories {
@ -150,5 +153,6 @@ curseforge {
addArtifact sourceJar addArtifact sourceJar
addArtifact javadocJar addArtifact javadocJar
addArtifact apiJar
} }
} }