From 67d9a48d75fe25f2fdc24edf96cec9c61f2616b9 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sun, 29 Mar 2015 09:40:27 +0200 Subject: [PATCH] API jars contain now classes and source files Updated dependencies also use those --- gradle/scripts/artifacts.gradle | 8 ++++---- gradle/scripts/dependencies.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/scripts/artifacts.gradle b/gradle/scripts/artifacts.gradle index a6956075..bc153b33 100644 --- a/gradle/scripts/artifacts.gradle +++ b/gradle/scripts/artifacts.gradle @@ -27,13 +27,13 @@ task devJar(type: Jar) { } task apiJar(type: Jar) { + from sourceSets.api.java + include "appeng/api/**" - from(sourceSets.api.java) { - include "appeng/api/**" - } + from sourceSets.main.output + include "appeng/api/**" classifier = 'api' - } artifacts { diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index 4404aadd..1f166178 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -52,13 +52,13 @@ dependencies { compile(group: 'api', name: 'ic2', version: "${config.api_ic2_version}") compile(group: 'api', name: 'immibis', version: "${config.api_immibis_version}") compile(group: 'api', name: 'invtweaks', version: "${config.api_invtweaks_version}") - compile(group: 'api', name: 'mekanism', version: "${config.api_mekansim_version}", classifier: 'api') compile(group: 'api', name: 'mfr', version: "${config.api_mfr_version}") compile(group: 'api', name: 'railcraft', version: "${config.api_railcraft_version}") compile(group: 'api', name: 'rblocks', version: "${config.api_rblocks_version}") compile(group: 'api', name: 'rf', version: "${config.api_rf_version}") compile "appeng:Waila:${config.api_waila_version}:api" compile "appeng:RotaryCraft:${config.api_rotarycraft_version}:api" + compile "appeng:mekanism:${config.api_mekansim_version}:api" testCompile "junit:junit:4.11" }