Skip to content

Commit

Permalink
Merge pull request #354 from chali/FixNameCheck
Browse files Browse the repository at this point in the history
Fix checking prefix for configuration name
  • Loading branch information
chali authored Sep 22, 2021
2 parents 2942d7b + 0f80b38 commit 330ce70
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ class DependencyService {
}

// all android confs get squashed into either debug or release output dir?
if (conf.startsWith('test')) {
if (confName.startsWith('test')) {
def androidTestDebugOutput = project.tasks.findByName('compileDebugUnitTestJavaWithJavac')?.destinationDir
if (androidTestDebugOutput && androidTestDebugOutput.exists()) {
return androidTestDebugOutput
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ class DependencyServiceSpec extends IntegrationTestKitSpec {
task compileClasspathSourceSetOutput {
doLast {
println('@@' + DependencyService.forProject(project).sourceSetByConf('compileClasspath').java.outputDir)
println('@@' + DependencyService.forProject(project).sourceSetByConf('compileClasspath').java.classesDirectory.get())
}
}
task integTestSourceSetOutput {
doLast {
println('@@' + DependencyService.forProject(project).sourceSetByConf('integTestCompileClasspath').java.outputDir)
println('@@' + DependencyService.forProject(project).sourceSetByConf('integTestCompileClasspath').java.classesDirectory.get())
}
}
"""
Expand Down

0 comments on commit 330ce70

Please sign in to comment.