Skip to content
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
12 changes: 6 additions & 6 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ com.jcraft:jzlib:1.1.2=integTestRuntimeClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-contacts-plugin:8.0.0=integTestRuntimeClasspath,testRuntimeClasspath
com.netflix.nebula:gradle-info-plugin:16.0.0=integTestRuntimeClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-gradle-interop:2.3.0=integTestRuntimeClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-publishing-plugin:23.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:11.12.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-publishing-plugin:23.1.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:12.5.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.perforce:p4java:2015.2.1365273=integTestRuntimeClasspath,testRuntimeClasspath
io.leangen.geantyref:geantyref:1.3.16=integTestRuntimeClasspath,testRuntimeClasspath
junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -29,10 +29,10 @@ org.hamcrest:hamcrest:3.0=integTestCompileClasspath,integTestRuntimeClasspath,te
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=integTestRuntimeClasspath,testRuntimeClasspath
org.jetbrains:annotations:13.0=integTestRuntimeClasspath,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit:junit-bom:5.14.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.14.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.14.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.14.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit:junit-bom:5.14.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.spockframework:spock-bom:2.4-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ class SourceDirectoryTask extends DefaultTask {
@IgnoreEmptyDirectories
@PathSensitive(PathSensitivity.RELATIVE)
def FileTree getSource() {
objectFactory.fileCollection().from(srcDirs).asFileTree
objectFactory.fileCollection().from(srcDirs).asFileTree.matching {
include "**/*.clj", "**/*.cljs", "**/*.cljc"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,36 @@ class NoToolchainNebulaClojurePluginIntegrationSpec extends BaseIntegrationTestK
new File(projectDir, "//build/classes/java/main/test/nebula/app.clj").exists()
}

def 'can compile clojure when non-clojure files are present in the source directory'() {
buildFile << '''\
plugins {
id 'com.netflix.nebula.clojure'
}

repositories { mavenCentral() }

dependencies {
implementation 'org.clojure:clojure:1.10.3'
}
'''.stripIndent()

settingsFile << 'rootProject.name="can-compile-clojure-with-readme"'

def clojurefiles = new File(projectDir, 'src/main/clojure/test/nebula')
clojurefiles.mkdirs()
new File(clojurefiles, 'app.clj').text = APP_CLJ
new File(clojurefiles, 'README.md').text = '# Not a clojure file'

when:
def result = runTasks('build', '-s')

then:
noExceptionThrown()

and:
new File(projectDir, "//build/classes/java/main/test/nebula/app.clj").exists()
}

def 'can compile clojure with aotCompile'() {
buildFile << '''\
plugins {
Expand Down
Loading