FJ works with Gradle 1.8, Scala 2.9 and Java 7

mperry · mperry · commit b7e6d522c38c · 2013-11-19T13:17:45.000+10:00
diff --git a/core/build.gradle b/core/build.gradle
@@ -0,0 +1,46 @@
+/*
+ * This build file was auto generated by running the Gradle 'buildSetup' task
+ * by 'MarkPerry' at '19/11/13 10:51 AM' with Gradle 1.8
+ *
+ * This generated file contains a sample Java project to get you started.
+ * For more details take a look at the Java Quickstart chapter in the Gradle
+ * user guide available at http://gradle.org/docs/1.8/userguide/tutorial_java_projects.html
+ */
+
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
+apply plugin: 'scala'
+
+defaultTasks 'build'
+
+ext {
+//	scalaVersion = "2.7.+"
+//	scalaVersion = "2.8.+"
+	scalaVersion = "2.9.+"
+
+	scalacheckVersion = "1.10.+"
+}
+
+
+
+// In this section you declare where to find the dependencies of your project
+repositories {
+    // Use 'maven central' for resolving your dependencies.
+    // You can declare any Maven/Ivy/file repository here.
+    mavenCentral()
+}
+
+// In this section you declare the dependencies for your production and test code
+dependencies {
+    // The production code uses the SLF4J logging API at compile time
+    compile 'org.slf4j:slf4j-api:1.7.5'
+	testCompile "org.scala-lang:scala-library:$scalaVersion"
+	testCompile "org.scalacheck:scalacheck_2.9.3:$scalacheckVersion"
+
+
+	// Declare the dependency for your favourite test framework you want to use in your tests.
+    // TestNG is also supported by the Gradle Test task. Just change the
+    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
+    // 'test.useTestNG()' to your build script.
+    testCompile "junit:junit:4.11"
+}
diff --git a/core/src/test/scala/fj/FunctionalJavaJUnitTest.java b/core/src/test/scala/fj/FunctionalJavaJUnitTest.java
@@ -10,12 +10,14 @@
  * Time: 12:06 PM
  * To change this template use File | Settings | File Templates.
  */
-public class JavaTest {
+public class FunctionalJavaJUnitTest {
 
 	@Test
-	public void test1() {
-		System.out.println("Hello world");
+	public void runScalacheckTests() {
+//		System.out.println("Hello world");
 		Assert.assertTrue(true);
+//		new Tests$().main(null);
+		Tests.main(null);
 	}
 
 }
diff --git a/core/src/test/scala/fj/Tests.scala b/core/src/test/scala/fj/Tests.scala
@@ -19,7 +19,7 @@ object Tests {
 
   def main(args: Array[String]) {
     run(tests)
-    System.exit(0)
+//    System.exit(0)
   }
 
   import org.scalacheck.Prop
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -0,0 +1,47 @@
+/*
+ * This build file was auto generated by running the Gradle 'buildSetup' task
+ * by 'MarkPerry' at '19/11/13 10:51 AM' with Gradle 1.8
+ *
+ * This generated file contains a sample Java project to get you started.
+ * For more details take a look at the Java Quickstart chapter in the Gradle
+ * user guide available at http://gradle.org/docs/1.8/userguide/tutorial_java_projects.html
+ */
+
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
+//apply plugin: 'scala'
+
+defaultTasks 'build'
+
+ext {
+//	scalaVersion = "2.7.+"
+//	scalaVersion = "2.8.+"
+	scalaVersion = "2.9.+"
+
+	scalacheckVersion = "1.10.+"
+}
+
+
+
+// In this section you declare where to find the dependencies of your project
+repositories {
+    // Use 'maven central' for resolving your dependencies.
+    // You can declare any Maven/Ivy/file repository here.
+    mavenCentral()
+}
+
+// In this section you declare the dependencies for your production and test code
+dependencies {
+    // The production code uses the SLF4J logging API at compile time
+    compile 'org.slf4j:slf4j-api:1.7.5'
+	compile project(":core")
+//	testCompile "org.scala-lang:scala-library:$scalaVersion"
+//	testCompile "org.scalacheck:scalacheck_2.9.3:$scalacheckVersion"
+
+
+	// Declare the dependency for your favourite test framework you want to use in your tests.
+    // TestNG is also supported by the Gradle Test task. Just change the
+    // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
+    // 'test.useTestNG()' to your build script.
+    testCompile "junit:junit:4.11"
+}
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,2 @@
+
+include 'core', 'demo'

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ object Tests {`
`19`	`19`
`20`	`20`	`def main(args: Array[String]) {`
`21`	`21`	`run(tests)`
`22`		`- System.exit(0)`
	`22`	`+// System.exit(0)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`import org.scalacheck.Prop`