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
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}

wrapper {
gradleVersion = "4.10.3"
gradleVersion = "5.2.1"
distributionType = Wrapper.DistributionType.ALL
}
}
Expand Down Expand Up @@ -69,7 +69,8 @@ allprojects {
sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
primaryEmail = "functionaljava@googlegroups.com"

dependencyJunit = "org.junit.vintage:junit-vintage-engine:5.3.2"
junitCompile = "junit:junit:4.12"
junitRuntime = "org.junit.vintage:junit-vintage-engine:5.3.2"

displayCompilerWarnings = true
}
Expand Down
3 changes: 2 additions & 1 deletion consume/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ archivesBaseName = "${project.projectName}-${project.name}"
dependencies {
compile("$group:$projectName:$fjConsumeVersion")

testCompile dependencyJunit
testCompile junitCompile
testRuntime junitRuntime
}
3 changes: 2 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ ext {
archivesBaseName = project.projectName

dependencies {
testCompile dependencyJunit
testCompile junitCompile
testRuntime junitRuntime
testCompile 'com.h2database:h2:1.4.197'
testCompile 'commons-dbutils:commons-dbutils:1.7'
}
Expand Down
3 changes: 2 additions & 1 deletion demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ archivesBaseName = "${project.projectName}-${project.name}"
dependencies {
compile project(":core")
compile project(":quickcheck")
testCompile dependencyJunit
testCompile junitCompile
testRuntime junitRuntime
}

test {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion java-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ ext {

dependencies {
compile project(":core")
testCompile dependencyJunit
testCompile junitCompile
testRuntime junitRuntime
}

performSigning(signingEnabled, signModule)
Expand Down
3 changes: 2 additions & 1 deletion performance/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

dependencies {
compile project(":core")
testCompile dependencyJunit
testCompile junitCompile
testRuntime junitRuntime
}
3 changes: 2 additions & 1 deletion props-core-scalacheck/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ dependencies {
compile "org.scala-lang:scala-library:$scalaVersion"
compile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"

testCompile dependencyJunit
testCompile junitCompile
testRuntime junitRuntime
}

performSigning(signingEnabled, signModule)
Expand Down
5 changes: 3 additions & 2 deletions props-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
archivesBaseName = "${project.projectName}-${project.name}"

dependencies {
compile project(":quickcheck")
testCompile dependencyJunit
compile project(":quickcheck")
testCompile junitCompile
testRuntime junitRuntime
}
2 changes: 1 addition & 1 deletion quickcheck/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ archivesBaseName = "${project.projectName}-${project.name}"

dependencies {
compile project(":core")
compile dependencyJunit
compile junitCompile
}

performSigning(signingEnabled, signModule)
Expand Down