shuffling the build logic a little bit more

This commit is contained in:
NikkyAI 2018-02-10 18:08:42 +01:00 committed by Unknown
parent e2410305af
commit 25896551bd
3 changed files with 62 additions and 31 deletions

View File

@ -10,8 +10,39 @@ buildscript {
}
}
plugins {
id "com.github.johnrengelman.shadow" version "1.2.4"
}
apply plugin: 'net.minecraftforge.gradle.forge'
version = mc_version + "-" + mod_version
archivesBaseName = "MatterLink"
sourceCompatibility = targetCompatibility = '1.8'
dependencies {
compile project(':core')
compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0"
}
shadowJar {
classifier ''
// configurations = [project.configurations.shadow]
relocate "org.apache.http", "matterlink.repack.org.apache.http"
relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging"
dependencies {
include(project(":core"))
include(dependency("org.apache.httpcomponents:httpclient:4.3.3"))
include(dependency("org.apache.httpcomponents:httpcore:4.3.2"))
include(dependency('commons-logging:commons-logging:1.1.3'))
}
exclude 'dummyThing'
}
minecraft {
version = mc_version + "-" + forge_version
runDir = "../run"

View File

@ -10,8 +10,39 @@ buildscript {
}
}
plugins {
id "com.github.johnrengelman.shadow" version "1.2.4"
}
apply plugin: 'net.minecraftforge.gradle.forge'
version = mc_version + "-" + mod_version
archivesBaseName = "MatterLink"
sourceCompatibility = targetCompatibility = '1.8'
dependencies {
compile project(':core')
compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0"
}
shadowJar {
classifier ''
// configurations = [project.configurations.shadow]
relocate "org.apache.http", "matterlink.repack.org.apache.http"
relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging"
dependencies {
include(project(":core"))
include(dependency("org.apache.httpcomponents:httpclient:4.3.3"))
include(dependency("org.apache.httpcomponents:httpcore:4.3.2"))
include(dependency('commons-logging:commons-logging:1.1.3'))
}
exclude 'dummyThing'
}
minecraft {
version = mc_version + "-" + forge_version
runDir = "../run"

View File

@ -1,6 +1,5 @@
plugins {
id "org.jetbrains.kotlin.jvm" version '1.2.21'
id "com.github.johnrengelman.shadow" version "1.2.4"
id 'idea'
}
@ -15,16 +14,7 @@ subprojects {
}
if(name != "core") {
apply plugin: 'com.github.johnrengelman.shadow'
version = mc_version + "-" + mod_version
archivesBaseName = "MatterLink"
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
}
repositories {
jcenter()
@ -35,26 +25,5 @@ subprojects {
url "http://maven.shadowfacts.net/"
}
}
dependencies {
compile project(':core')
compile group: "net.shadowfacts", name: "Forgelin", version: "1.6.0"
}
shadowJar {
classifier ''
// configurations = [project.configurations.shadow]
relocate "org.apache.http", "matterlink.repack.org.apache.http"
relocate "org.apache.commons.logging", "matterlink.repack.org.apache.commons.logging"
dependencies {
include(project(":core"))
include(dependency("org.apache.httpcomponents:httpclient:4.3.3"))
include(dependency("org.apache.httpcomponents:httpcore:4.3.2"))
include(dependency('commons-logging:commons-logging:1.1.3'))
}
exclude 'dummyThing'
}
}
}