Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use proper configuration as classpath for testing and building jars so implementation and api configurations can be used #31

Merged
merged 1 commit into from
Aug 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ class ClojureBasePlugin implements Plugin<Project> {
def clojureTest = project.task("clojureTest", type: ClojureTest) {
from project.sourceSets.test.clojure
delayedJvmOptions = { compileTask.jvmOptions }
delayedClasspath = { project.configurations.testRuntime }
delayedClasspath = { project.configurations.testRuntimeClasspath }
delayedOutputDir = { findOutputDir(project.sourceSets.main) }
delayedJunitOutputDir = {
project.file(project.buildDir.path + "/test-results")
}
dependsOn project.tasks.classes, project.configurations.testRuntime
dependsOn project.tasks.classes, project.configurations.testRuntimeClasspath
description = "Run Clojure tests in src/test."
group = JavaBasePlugin.VERIFICATION_GROUP
if (project.hasProperty("clojuresque.test.vars")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ClojureExtrasDepsPlugin implements Plugin<Project> {
'Copy runtime dependencies into the "lib" directory'
group = "other"
into 'lib'
from project.configurations.runtime
from project.configurations.runtimeClasspath
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public class ClojureExtrasUberJarPlugin implements Plugin<Project> {
description =
'Constructs a jar with all runtime dependencies included'
group = "other"
dependsOn jar.source, project.configurations.runtime
dependsOn jar.source, project.configurations.runtimeClasspath
String baseName = jar.archiveBaseName.getOrNull() + '-standalone'
archiveBaseName.convention baseName
archiveBaseName.set baseName
enabled = false
doFirst {
project.configurations.runtime.each {
project.configurations.runtimeClasspath.each {
from project.zipTree(it)
exclude 'META-INF/MANIFEST.MF'
exclude 'META-INF/*.SF'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ClojureReplPlugin implements Plugin<Project> {
project.files(
sourceRoots,
project.sourceSets.collect { it.output },
project.configurations.testRuntime,
project.configurations.testRuntimeClasspath,
project.configurations.development
)
}
Expand Down