Skip to content

Commit e590239

Browse files
committed
Support configuration cache
1 parent f723a22 commit e590239

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

src/main/groovy/nebula/plugin/clojuresque/ClojureBasePlugin.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ClojureBasePlugin implements Plugin<Project> {
7171
def compileTaskName = set.getCompileTaskName("clojure")
7272
TaskProvider<ClojureCompile> task = project.tasks.register(compileTaskName, ClojureCompile)
7373
task.configure {
74-
from set.clojure
74+
from project.file("src/${set.name}/clojure")
7575
aotCompile.set(extension.aotCompile)
7676
warnOnReflection.set(extension.warnOnReflection)
7777
classpath.from(
@@ -92,7 +92,7 @@ class ClojureBasePlugin implements Plugin<Project> {
9292
def docTaskName = set.getTaskName(null, "clojuredoc")
9393
TaskProvider<ClojureDoc> task = project.tasks.register(docTaskName, ClojureDoc)
9494
task.configure {
95-
from set.clojure
95+
from project.file("src/${set.name}/clojure")
9696
destinationDir.set(project.file(project.docsDir.path + "/clojuredoc"))
9797
classpath.from(
9898
set.compileClasspath
@@ -106,7 +106,7 @@ class ClojureBasePlugin implements Plugin<Project> {
106106
private void configureTests(Project project) {
107107
TaskProvider<ClojureTest> clojureTest = project.tasks.register('clojureTest', ClojureTest)
108108
clojureTest.configure {
109-
from project.sourceSets.test.clojure
109+
from project.file("src/test/clojure")
110110
classpath.from(
111111
project.configurations.testRuntimeClasspath.incoming.files
112112
)
@@ -133,7 +133,7 @@ class ClojureBasePlugin implements Plugin<Project> {
133133
def runTaskName = set.getTaskName(null, "clojureRun")
134134
TaskProvider<ClojureRun> task = project.tasks.register(runTaskName, ClojureRun)
135135
task.configure {
136-
from set.clojure
136+
from project.file("src/${set.name}/clojure")
137137
classpath.from(
138138
set.compileClasspath
139139
)

src/main/groovy/nebula/plugin/utils/tasks/SourceDirectoryTask.groovy

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,11 @@ class SourceDirectoryTask extends DefaultTask {
140140
* @param sourceSet The source set to add
141141
* @return this
142142
*/
143-
def from(SourceDirectorySet sourceSet) {
143+
def from(File sourceSet) {
144144
srcDirs << sourceSet
145145
this
146146
}
147147

148-
def from(DefaultClojureSourceSet sourceSet) {
149-
srcDirs << sourceSet.clojure
150-
this
151-
}
152-
153148
/**
154149
* Get the tree of source files. The source files are filtered
155150
* according to the set filters.

src/test/groovy/nebula/plugin/clojure/BaseIntegrationTestKitSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import nebula.test.IntegrationTestKitSpec
55
abstract class BaseIntegrationTestKitSpec extends IntegrationTestKitSpec {
66
def setup() {
77
// Enable configuration cache :)
8-
//new File(projectDir, 'gradle.properties') << '''org.gradle.configuration-cache=true'''.stripIndent()
8+
new File(projectDir, 'gradle.properties') << '''org.gradle.configuration-cache=true'''.stripIndent()
99
}
1010

1111
void disableConfigurationCache() {

0 commit comments

Comments
 (0)