Skip to content

Commit bef91fb

Browse files
committed
Merge pull request #131 from javafp/optic-laws
Add optics laws in tests and configure tests module for publishing
2 parents daab197 + 6bdd384 commit bef91fb

21 files changed

+238
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ subprojects {
8585
}
8686
}
8787

88-
configure(subprojects.findAll {it.name != 'tests'}) {
88+
configure(subprojects) {
8989

9090
apply plugin: "maven"
9191
apply plugin: "signing"
@@ -146,4 +146,4 @@ task wrapper(type: Wrapper) {
146146

147147
task env << {
148148
println System.getenv()
149-
}
149+
}

tests/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11

2+
archivesBaseName = "${project.projectName}-${project.name}"
3+
24
apply plugin: 'scala'
35

46
ext {
57
scalaVersion = "2.11.6"
68
scalacheckScalaVersion = "2.11"
79
scalacheckVersion = "1.12.2"
10+
signModule = true
811
}
912

1013
tasks.withType(ScalaCompile) {
@@ -14,11 +17,16 @@ tasks.withType(ScalaCompile) {
1417
dependencies {
1518
compile project(":core")
1619
compile "org.scala-lang:scala-library:$scalaVersion"
20+
compile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
1721

18-
testCompile "org.scala-lang:scala-library:$scalaVersion"
19-
testCompile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
2022
testCompile dependencyJunit
2123
}
2224

2325
sourceCompatibility = "1.7"
2426

27+
performSigning(signingEnabled, signModule)
28+
configureUpload(signingEnabled, signModule)
29+
30+
uploadArchives.enabled = true
31+
32+

tests/src/test/scala/fj/control/parallel/ArbitraryParModule.scala renamed to tests/src/main/scala/fj/control/parallel/ArbitraryParModule.scala

File renamed without changes.

tests/src/test/scala/fj/control/parallel/ArbitraryStrategy.scala renamed to tests/src/main/scala/fj/control/parallel/ArbitraryStrategy.scala

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)