Skip to content

Commit 3024767

Browse files
committed
Back out use of java-library in favor of creating own api configuration for now (java-library somehow causes issues with test compilation)
SVN r63577 |2019-05-06 16:03:52 +0000
1 parent 3865389 commit 3024767

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

java/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
12
plugins {
23
id 'java'
3-
id 'java-library'
4+
// id 'java-library'
45
id 'maven'
56
id 'maven-publish'
67
}
78

9+
810
buildDir = new File(project.rootProject.buildDir, "/remoteapi/java")
911

1012
def artifactPrefix = 'labkey-client-api'
@@ -18,6 +20,10 @@ import org.labkey.gradle.util.BuildUtils
1820
import org.labkey.gradle.util.GroupNames
1921
import org.labkey.gradle.task.PomFile
2022

23+
project.configurations {
24+
api.extendsFrom(compile) // added for use by PomFile task
25+
}
26+
2127
dependencies {
2228
compile "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
2329
compile ("com.googlecode.json-simple:json-simple:${jsonSimpleVersion}")
@@ -51,6 +57,7 @@ project.tasks.withType(JavaCompile) {
5157
targetCompatibility = project.ext.targetCompatibility
5258
}
5359

60+
5461
project.task("fatJar",
5562
description: "Generate single jar file containing the api and all its dependent classes",
5663
group: GroupNames.BUILD,

0 commit comments

Comments
 (0)