Relocate http mime

This commit is contained in:
Matthew Messinger 2018-07-08 18:00:58 -04:00
parent 77b8357f03
commit e33c8f6fda

View file

@ -13,11 +13,13 @@ buildscript {
dependencies { dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
} }
} }
apply plugin: 'net.minecraftforge.gradle.liteloader' apply plugin: 'net.minecraftforge.gradle.liteloader'
apply plugin: 'org.spongepowered.mixin' apply plugin: 'org.spongepowered.mixin'
apply plugin: 'com.github.johnrengelman.shadow'
group = 'com.minelittlepony' group = 'com.minelittlepony'
version = '1.12.2.2-SNAPSHOT' version = '1.12.2.2-SNAPSHOT'
@ -39,14 +41,14 @@ sourceSets {
ext.refMap = 'hdskins.mixin.refmap.json' ext.refMap = 'hdskins.mixin.refmap.json'
} }
main { main {
compileClasspath += hdskins.output + hdskins.compileClasspath compileClasspath += hdskins.output
ext.refMap = 'minelp.mixin.refmap.json' ext.refMap = 'minelp.mixin.refmap.json'
} }
} }
dependencies { dependencies {
// use the same version as httpclient // use the same version as httpclient
hdskinsCompile('org.apache.httpcomponents:httpmime:4.3.2'){ compile('org.apache.httpcomponents:httpmime:4.3.2'){
transitive = false transitive = false
} }
} }
@ -71,9 +73,23 @@ litemod.json {
jar { jar {
from sourceSets.hdskins.output from sourceSets.hdskins.output
from litemod from litemod
classifier 'base'
extension 'jar'
}
shadowJar {
extension 'litemod'
classifier "mc$minecraft.version"
baseName "mod-${project.name.toLowerCase()}"
// TODO relocate. LiteLoader excludes apache libs from classloading from sourceSets.hdskins.output
from {configurations.hdskinsCompile.collect{it.isDirectory() ? it : zipTree(it)}} from litemod
dependencies {
exclude dependency('deobf.com.mumfrey:liteloader:')
exclude dependency('deobf.org.ow2.asm:')
exclude 'META-INF/**'
}
relocate 'org.apache.http.entity.mime', 'com.voxelmodpack.repack.org.apache.http.entity.mime'
exclude 'dummyThing'
} }
sourceJar { sourceJar {
// add hdskins sources // add hdskins sources
@ -92,10 +108,15 @@ task skinZip(type: Zip) {
version 'v1' version 'v1'
} }
artifacts {
archives shadowJar
}
reobf { reobf {
srgJar { srgJar {
mappingType = 'SEARGE' mappingType = 'SEARGE'
} }
shadowJar{}
} }
mixin { mixin {
defaultObfuscationEnv notch defaultObfuscationEnv notch