Skip to content
Merged
Changes from 1 commit
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
Next Next commit
Set scalatest as testCompile dependency
Gradle now generates correct eclipse dependencies
  • Loading branch information
gliptak committed Jul 8, 2014
commit 2eec079813c578e168b82f355954aed9066ca59c
2 changes: 1 addition & 1 deletion language-adaptors/rxjava-scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {

provided 'junit:junit-dep:4.10'
provided 'org.mockito:mockito-core:1.8.5'
provided 'org.scalatest:scalatest_2.10:1.9.1'
testCompile 'org.scalatest:scalatest_2.10:1.9.1'
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@benjchristensen do you know why use provide here? Looks most of other projects also use provided. I suppose testCompile may be better for these test libraries. I changed provided to testCompile in rxjava-scala. Looks it works.

dependencies {
    compile 'org.scala-lang:scala-library:2.10.+'

    compile project(':rxjava-core')

    testCompile 'junit:junit-dep:4.10'
    testCompile 'org.mockito:mockito-core:1.8.5'
    testCompile 'org.scalatest:scalatest_2.10:1.9.1'
}

tasks.compileScala {  
    classpath = classpath + (configurations.compile + configurations.provided)
}

tasks.compileExamplesScala {  
    classpath = classpath + files(compileScala.destinationDir) + (configurations.compile + configurations.testCompile)
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of provided dates back to over a year ago and is no longer the correct approach. We should move to testCompile. I haven't merged this yet because it failed to build and wasn't obvious why. Also, if we're changing it, we should completely remove provided.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is all voodoo for me, but I do know that whenever I refresh my repo, I need to install everything that is "provided" by hand, which is not what I would like and expect.

}

tasks.compileScala {
Expand Down