erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Support internal.

Browse source
This commit is contained in:
Cedric Beust 2016-07-18 01:29:13 -08:00
parent 9d582d5215
commit f73315d97a
5 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/CompilerActionInfo.kt
View file

@ -10,6 +10,5 @@ data class CompilerActionInfo(val directory: String?,
val sourceFiles: List<String>,
val suffixesBeingCompiled: List<String>,
val outputDir: File,
val compilerArgs: List<String>)
val compilerArgs: List<String>,
val friendPaths: List<String>)

9
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/CompilerUtils.kt
View file

@ -170,10 +170,17 @@ class CompilerUtils @Inject constructor(val files: KFiles,
// Finally, alter the info with the compiler interceptors before returning it
val initialActionInfo = CompilerActionInfo(projectDirectory.path, classpath, allSources,
sourceSuffixes, buildDirectory, emptyList() /* the flags will be provided by flag contributors */)
sourceSuffixes, buildDirectory, emptyList() /* the flags will be provided by flag contributors */,
emptyList())
val result = context.pluginInfo.compilerInterceptors.fold(initialActionInfo, { ai, interceptor ->
interceptor.intercept(project, context, ai)
})
//
// friendPaths
//
val friendPaths = KFiles.joinDir(project.buildDirectory, KFiles.CLASSES_DIR)
return result
}

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
View file

@ -33,8 +33,9 @@ abstract class GenericTestRunner: ITestRunnerContributor {
File(this).mkdirs()
}
val testClasses = IFileSpec.GlobSpec(toClassPaths(testConfig.testIncludes))
.toFiles(project.directory, path, testConfig.testExcludes.map { Glob(it) })
val files = IFileSpec.GlobSpec(toClassPaths(testConfig.testIncludes))
.toFiles(project.directory, path, testConfig.testExcludes.map { Glob(it) })
val testClasses = files
.filter { ! it.path.contains('$') }
.map {
File(KFiles.joinDir(project.directory, testClassDir, it.path))