functionaljava · mperry · Jun 5, 2015 · Jun 4, 2015 · Jun 4, 2015 · Jun 4, 2015
diff --git a/build.gradle b/build.gradle
@@ -85,7 +85,7 @@ subprojects {
 	}
 }
 
-configure(subprojects) {
+configure(subprojects.findAll { it.name != "props-core" }) {
 
     apply plugin: "maven"
     apply plugin: "signing"

diff --git a/core/src/test/java/fj/data/BooleansTest.java b/core/src/test/java/fj/data/BooleansTest.java
@@ -2,7 +2,6 @@
 
 import fj.F;
 import fj.function.Booleans;
-import fj.test.Property;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -13,5 +13,6 @@ retrolambda {
 
 dependencies {
 	compile project(":core")
+	compile project(":quickcheck")
     testCompile dependencyJunit
 }
diff --git a/tests/build.gradle → props-core-scalacheck/build.gradle b/tests/build.gradle → props-core-scalacheck/build.gradle
diff --git a/tests/src/main/scala/fj/ArbitraryP.scala → ...acheck/src/main/scala/fj/ArbitraryP.scala b/tests/src/main/scala/fj/ArbitraryP.scala → ...acheck/src/main/scala/fj/ArbitraryP.scala
diff --git a/...control/parallel/ArbitraryParModule.scala → ...control/parallel/ArbitraryParModule.scala b/...control/parallel/ArbitraryParModule.scala → ...control/parallel/ArbitraryParModule.scala
diff --git a/.../control/parallel/ArbitraryStrategy.scala → .../control/parallel/ArbitraryStrategy.scala b/.../control/parallel/ArbitraryStrategy.scala → .../control/parallel/ArbitraryStrategy.scala
diff --git a/...c/main/scala/fj/data/ArbitraryArray.scala → ...c/main/scala/fj/data/ArbitraryArray.scala b/...c/main/scala/fj/data/ArbitraryArray.scala → ...c/main/scala/fj/data/ArbitraryArray.scala
diff --git a/...main/scala/fj/data/ArbitraryHashMap.scala → ...main/scala/fj/data/ArbitraryHashMap.scala b/...main/scala/fj/data/ArbitraryHashMap.scala → ...main/scala/fj/data/ArbitraryHashMap.scala
diff --git a/...main/scala/fj/data/ArbitraryHashSet.scala → ...main/scala/fj/data/ArbitraryHashSet.scala b/...main/scala/fj/data/ArbitraryHashSet.scala → ...main/scala/fj/data/ArbitraryHashSet.scala
diff --git a/...rc/main/scala/fj/data/ArbitraryList.scala → ...rc/main/scala/fj/data/ArbitraryList.scala b/...rc/main/scala/fj/data/ArbitraryList.scala → ...rc/main/scala/fj/data/ArbitraryList.scala
diff --git a/.../main/scala/fj/data/ArbitraryOption.scala → .../main/scala/fj/data/ArbitraryOption.scala b/.../main/scala/fj/data/ArbitraryOption.scala → .../main/scala/fj/data/ArbitraryOption.scala
diff --git a/...src/main/scala/fj/data/ArbitrarySet.scala → ...src/main/scala/fj/data/ArbitrarySet.scala b/...src/main/scala/fj/data/ArbitrarySet.scala → ...src/main/scala/fj/data/ArbitrarySet.scala
diff --git a/.../main/scala/fj/data/ArbitraryStream.scala → .../main/scala/fj/data/ArbitraryStream.scala b/.../main/scala/fj/data/ArbitraryStream.scala → .../main/scala/fj/data/ArbitraryStream.scala
diff --git a/...rc/main/scala/fj/data/ArbitraryTree.scala → ...rc/main/scala/fj/data/ArbitraryTree.scala b/...rc/main/scala/fj/data/ArbitraryTree.scala → ...rc/main/scala/fj/data/ArbitraryTree.scala
diff --git a/...main/scala/fj/data/ArbitraryTreeMap.scala → ...main/scala/fj/data/ArbitraryTreeMap.scala b/...main/scala/fj/data/ArbitraryTreeMap.scala → ...main/scala/fj/data/ArbitraryTreeMap.scala
diff --git a/...rc/main/scala/fj/data/optic/IsoLaws.scala → ...rc/main/scala/fj/data/optic/IsoLaws.scala b/...rc/main/scala/fj/data/optic/IsoLaws.scala → ...rc/main/scala/fj/data/optic/IsoLaws.scala
diff --git a/...c/main/scala/fj/data/optic/LensLaws.scala → ...c/main/scala/fj/data/optic/LensLaws.scala b/...c/main/scala/fj/data/optic/LensLaws.scala → ...c/main/scala/fj/data/optic/LensLaws.scala
diff --git a/...in/scala/fj/data/optic/OptionalLaws.scala → ...in/scala/fj/data/optic/OptionalLaws.scala b/...in/scala/fj/data/optic/OptionalLaws.scala → ...in/scala/fj/data/optic/OptionalLaws.scala
diff --git a/.../main/scala/fj/data/optic/PrismLaws.scala → .../main/scala/fj/data/optic/PrismLaws.scala b/.../main/scala/fj/data/optic/PrismLaws.scala → .../main/scala/fj/data/optic/PrismLaws.scala
diff --git a/...main/scala/fj/data/optic/SetterLaws.scala → ...main/scala/fj/data/optic/SetterLaws.scala b/...main/scala/fj/data/optic/SetterLaws.scala → ...main/scala/fj/data/optic/SetterLaws.scala
diff --git a/...n/scala/fj/data/optic/TraversalLaws.scala → ...n/scala/fj/data/optic/TraversalLaws.scala b/...n/scala/fj/data/optic/TraversalLaws.scala → ...n/scala/fj/data/optic/TraversalLaws.scala
diff --git a/tests/src/main/scala/fj/package.scala → ...calacheck/src/main/scala/fj/package.scala b/tests/src/main/scala/fj/package.scala → ...calacheck/src/main/scala/fj/package.scala
diff --git a/...est/scala/fj/FunctionalJavaJUnitTest.java → ...est/scala/fj/FunctionalJavaJUnitTest.java b/...est/scala/fj/FunctionalJavaJUnitTest.java → ...est/scala/fj/FunctionalJavaJUnitTest.java
diff --git a/tests/src/test/scala/fj/Implicit.scala → ...alacheck/src/test/scala/fj/Implicit.scala b/tests/src/test/scala/fj/Implicit.scala → ...alacheck/src/test/scala/fj/Implicit.scala
diff --git a/tests/src/test/scala/fj/Tests.scala → ...-scalacheck/src/test/scala/fj/Tests.scala b/tests/src/test/scala/fj/Tests.scala → ...-scalacheck/src/test/scala/fj/Tests.scala
diff --git a/.../fj/control/parallel/CheckParModule.scala → .../fj/control/parallel/CheckParModule.scala b/.../fj/control/parallel/CheckParModule.scala → .../fj/control/parallel/CheckParModule.scala
diff --git a/...a/fj/control/parallel/CheckStrategy.scala → ...a/fj/control/parallel/CheckStrategy.scala b/...a/fj/control/parallel/CheckStrategy.scala → ...a/fj/control/parallel/CheckStrategy.scala
diff --git a/...s/src/test/scala/fj/data/CheckArray.scala → ...k/src/test/scala/fj/data/CheckArray.scala b/...s/src/test/scala/fj/data/CheckArray.scala → ...k/src/test/scala/fj/data/CheckArray.scala
diff --git a/...src/test/scala/fj/data/CheckHashMap.scala → ...src/test/scala/fj/data/CheckHashMap.scala b/...src/test/scala/fj/data/CheckHashMap.scala → ...src/test/scala/fj/data/CheckHashMap.scala
diff --git a/...src/test/scala/fj/data/CheckHashSet.scala → ...src/test/scala/fj/data/CheckHashSet.scala b/...src/test/scala/fj/data/CheckHashSet.scala → ...src/test/scala/fj/data/CheckHashSet.scala
diff --git a/tests/src/test/scala/fj/data/CheckIO.scala → ...heck/src/test/scala/fj/data/CheckIO.scala b/tests/src/test/scala/fj/data/CheckIO.scala → ...heck/src/test/scala/fj/data/CheckIO.scala
diff --git a/...rc/test/scala/fj/data/CheckIteratee.scala → ...rc/test/scala/fj/data/CheckIteratee.scala b/...rc/test/scala/fj/data/CheckIteratee.scala → ...rc/test/scala/fj/data/CheckIteratee.scala
diff --git a/tests/src/test/scala/fj/data/CheckList.scala → ...ck/src/test/scala/fj/data/CheckList.scala b/tests/src/test/scala/fj/data/CheckList.scala → ...ck/src/test/scala/fj/data/CheckList.scala
diff --git a/.../src/test/scala/fj/data/CheckOption.scala → .../src/test/scala/fj/data/CheckOption.scala b/.../src/test/scala/fj/data/CheckOption.scala → .../src/test/scala/fj/data/CheckOption.scala
diff --git a/tests/src/test/scala/fj/data/CheckSet.scala → ...eck/src/test/scala/fj/data/CheckSet.scala b/tests/src/test/scala/fj/data/CheckSet.scala → ...eck/src/test/scala/fj/data/CheckSet.scala
diff --git a/.../src/test/scala/fj/data/CheckStream.scala → .../src/test/scala/fj/data/CheckStream.scala b/.../src/test/scala/fj/data/CheckStream.scala → .../src/test/scala/fj/data/CheckStream.scala
diff --git a/tests/src/test/scala/fj/data/CheckTree.scala → ...ck/src/test/scala/fj/data/CheckTree.scala b/tests/src/test/scala/fj/data/CheckTree.scala → ...ck/src/test/scala/fj/data/CheckTree.scala
diff --git a/...src/test/scala/fj/data/CheckTreeMap.scala → ...src/test/scala/fj/data/CheckTreeMap.scala b/...src/test/scala/fj/data/CheckTreeMap.scala → ...src/test/scala/fj/data/CheckTreeMap.scala
diff --git a/props-core/build.gradle b/props-core/build.gradle
@@ -0,0 +1,13 @@
+
+apply plugin: 'me.tatarka.retrolambda'
+
+retrolambda {
+    jdk System.getenv("JAVA8_HOME")
+    oldJdk System.getenv("JAVA7_HOME")
+    javaVersion JavaVersion.VERSION_1_7
+}
+
+dependencies {
+	compile project(":quickcheck")
+    testCompile dependencyJunit
+}
diff --git a/core/src/test/java/fj/MemoisationTest.java → ...ore/src/test/java/fj/MemoisationTest.java b/core/src/test/java/fj/MemoisationTest.java → ...ore/src/test/java/fj/MemoisationTest.java
diff --git a/core/src/test/java/fj/data/ReaderTest.java → ...ore/src/test/java/fj/data/ReaderTest.java b/core/src/test/java/fj/data/ReaderTest.java → ...ore/src/test/java/fj/data/ReaderTest.java
diff --git a/core/src/test/java/fj/data/TestRngState.java → ...e/src/test/java/fj/data/TestRngState.java b/core/src/test/java/fj/data/TestRngState.java → ...e/src/test/java/fj/data/TestRngState.java
diff --git a/core/src/test/java/fj/data/WriterTest.java → ...ore/src/test/java/fj/data/WriterTest.java b/core/src/test/java/fj/data/WriterTest.java → ...ore/src/test/java/fj/data/WriterTest.java
diff --git a/...va/fj/data/properties/ListProperties.java → ...va/fj/data/properties/ListProperties.java b/...va/fj/data/properties/ListProperties.java → ...va/fj/data/properties/ListProperties.java
@@ -1,10 +1,9 @@
 package fj.data.properties;
 
-import fj.Equal;
 import fj.P;
 import fj.P2;
 import fj.data.List;
-import fj.runner.PropertyTestRunner;
+import fj.test.runner.PropertyTestRunner;
 import fj.test.Gen;
 import fj.test.Property;
 import org.junit.runner.RunWith;

diff --git a/...ta/properties/NonEmptyListProperties.java → ...ta/properties/NonEmptyListProperties.java b/...ta/properties/NonEmptyListProperties.java → ...ta/properties/NonEmptyListProperties.java
@@ -5,7 +5,7 @@
 import fj.P2;
 import fj.data.List;
 import fj.data.NonEmptyList;
-import fj.runner.PropertyTestRunner;
+import fj.test.runner.PropertyTestRunner;
 import fj.test.Property;
 import org.junit.runner.RunWith;
 

diff --git a/...ava/fj/data/properties/SeqProperties.java → ...ava/fj/data/properties/SeqProperties.java b/...ava/fj/data/properties/SeqProperties.java → ...ava/fj/data/properties/SeqProperties.java
@@ -5,7 +5,7 @@
 import fj.P2;
 import fj.data.Option;
 import fj.data.Seq;
-import fj.runner.PropertyTestRunner;
+import fj.test.runner.PropertyTestRunner;
 import fj.test.Arbitrary;
 import fj.test.Gen;
 import fj.test.Property;

diff --git a/quickcheck/build.gradle b/quickcheck/build.gradle
@@ -0,0 +1,15 @@
+
+apply plugin: 'me.tatarka.retrolambda'
+
+archivesBaseName = "${project.projectName}-${project.name}"
+
+retrolambda {
+    jdk System.getenv("JAVA8_HOME")
+    oldJdk System.getenv("JAVA7_HOME")
+    javaVersion JavaVersion.VERSION_1_7
+}
+
+dependencies {
+	compile project(":core")
+    compile dependencyJunit
+}
diff --git a/...est/java/fj/data/test/PropertyAssert.java → ...ain/java/fj/data/test/PropertyAssert.java b/...est/java/fj/data/test/PropertyAssert.java → ...ain/java/fj/data/test/PropertyAssert.java
diff --git a/core/src/main/java/fj/test/Arbitrary.java → ...heck/src/main/java/fj/test/Arbitrary.java b/core/src/main/java/fj/test/Arbitrary.java → ...heck/src/main/java/fj/test/Arbitrary.java
diff --git a/core/src/main/java/fj/test/Arg.java → quickcheck/src/main/java/fj/test/Arg.java b/core/src/main/java/fj/test/Arg.java → quickcheck/src/main/java/fj/test/Arg.java
diff --git a/core/src/main/java/fj/test/Bool.java → quickcheck/src/main/java/fj/test/Bool.java b/core/src/main/java/fj/test/Bool.java → quickcheck/src/main/java/fj/test/Bool.java
diff --git a/core/src/main/java/fj/test/CheckResult.java → ...ck/src/main/java/fj/test/CheckResult.java b/core/src/main/java/fj/test/CheckResult.java → ...ck/src/main/java/fj/test/CheckResult.java
diff --git a/core/src/main/java/fj/test/Coarbitrary.java → ...ck/src/main/java/fj/test/Coarbitrary.java b/core/src/main/java/fj/test/Coarbitrary.java → ...ck/src/main/java/fj/test/Coarbitrary.java
diff --git a/core/src/main/java/fj/test/Gen.java → quickcheck/src/main/java/fj/test/Gen.java b/core/src/main/java/fj/test/Gen.java → quickcheck/src/main/java/fj/test/Gen.java
diff --git a/core/src/main/java/fj/test/Property.java → ...check/src/main/java/fj/test/Property.java b/core/src/main/java/fj/test/Property.java → ...check/src/main/java/fj/test/Property.java
diff --git a/core/src/main/java/fj/test/Rand.java → quickcheck/src/main/java/fj/test/Rand.java b/core/src/main/java/fj/test/Rand.java → quickcheck/src/main/java/fj/test/Rand.java
diff --git a/core/src/main/java/fj/test/Result.java → quickcheck/src/main/java/fj/test/Result.java b/core/src/main/java/fj/test/Result.java → quickcheck/src/main/java/fj/test/Result.java
diff --git a/core/src/main/java/fj/test/Shrink.java → quickcheck/src/main/java/fj/test/Shrink.java b/core/src/main/java/fj/test/Shrink.java → quickcheck/src/main/java/fj/test/Shrink.java
diff --git a/core/src/main/java/fj/test/Variant.java → ...kcheck/src/main/java/fj/test/Variant.java b/core/src/main/java/fj/test/Variant.java → ...kcheck/src/main/java/fj/test/Variant.java
diff --git a/core/src/main/java/fj/test/package-info.java → ...k/src/main/java/fj/test/package-info.java b/core/src/main/java/fj/test/package-info.java → ...k/src/main/java/fj/test/package-info.java
diff --git a/...c/main/java/fj/test/reflect/Category.java → ...c/main/java/fj/test/reflect/Category.java b/...c/main/java/fj/test/reflect/Category.java → ...c/main/java/fj/test/reflect/Category.java
diff --git a/.../src/main/java/fj/test/reflect/Check.java → .../src/main/java/fj/test/reflect/Check.java b/.../src/main/java/fj/test/reflect/Check.java → .../src/main/java/fj/test/reflect/Check.java
diff --git a/...ain/java/fj/test/reflect/CheckParams.java → ...ain/java/fj/test/reflect/CheckParams.java b/...ain/java/fj/test/reflect/CheckParams.java → ...ain/java/fj/test/reflect/CheckParams.java
diff --git a/core/src/main/java/fj/test/reflect/Main.java → ...k/src/main/java/fj/test/reflect/Main.java b/core/src/main/java/fj/test/reflect/Main.java → ...k/src/main/java/fj/test/reflect/Main.java
diff --git a/core/src/main/java/fj/test/reflect/Name.java → ...k/src/main/java/fj/test/reflect/Name.java b/core/src/main/java/fj/test/reflect/Name.java → ...k/src/main/java/fj/test/reflect/Name.java
diff --git a/...rc/main/java/fj/test/reflect/NoCheck.java → ...rc/main/java/fj/test/reflect/NoCheck.java b/...rc/main/java/fj/test/reflect/NoCheck.java → ...rc/main/java/fj/test/reflect/NoCheck.java
diff --git a/...in/java/fj/test/reflect/package-info.java → ...in/java/fj/test/reflect/package-info.java b/...in/java/fj/test/reflect/package-info.java → ...in/java/fj/test/reflect/package-info.java
diff --git a/...st/java/fj/runner/PropertyTestRunner.java → ...va/fj/test/runner/PropertyTestRunner.java b/...st/java/fj/runner/PropertyTestRunner.java → ...va/fj/test/runner/PropertyTestRunner.java
@@ -1,4 +1,4 @@
-package fj.runner;
+package fj.test.runner;
 
 import org.junit.runner.Description;
 import org.junit.runner.Runner;

diff --git a/...src/test/java/fj/data/test/TestCheck.java → ...src/test/java/fj/data/test/TestCheck.java b/...src/test/java/fj/data/test/TestCheck.java → ...src/test/java/fj/data/test/TestCheck.java
diff --git a/.../src/test/java/fj/data/test/TestNull.java → .../src/test/java/fj/data/test/TestNull.java b/.../src/test/java/fj/data/test/TestNull.java → .../src/test/java/fj/data/test/TestNull.java
diff --git a/core/src/test/java/fj/test/TestRand.java → ...check/src/test/java/fj/test/TestRand.java b/core/src/test/java/fj/test/TestRand.java → ...check/src/test/java/fj/test/TestRand.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 
 rootProject.name = "functionaljava"
 
-include 'core', 'demo', "tests", "consume", "java8"
+include "core", "demo", "consume", "java8", "quickcheck", "props-core", "props-core-scalacheck"