From 44ed2e53f0d66f62988c532f5a8ceb056bb74d65 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 8 Apr 2018 18:58:55 -0700
Subject: First pass at a Caffeine integration build now works (only on Java 9
 tho)

---
 .../test/src/mill/integration/CaffeineTests.scala    | 20 ++++++++++++++++++++
 .../src/mill/integration/IntegrationTestSuite.scala  |  4 +---
 .../test/src/mill/integration/forked/Tests.scala     |  1 +
 .../test/src/mill/integration/local/Tests.scala      |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 integration/test/src/mill/integration/CaffeineTests.scala

(limited to 'integration/test/src')

diff --git a/integration/test/src/mill/integration/CaffeineTests.scala b/integration/test/src/mill/integration/CaffeineTests.scala
new file mode 100644
index 00000000..b206aa97
--- /dev/null
+++ b/integration/test/src/mill/integration/CaffeineTests.scala
@@ -0,0 +1,20 @@
+package mill.integration
+
+import utest._
+
+class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_REPO", "caffeine", fork) {
+  val tests = Tests{
+    initWorkspace()
+    'test - {
+      // Caffeine only can build using Java 9 or up. Java 8 results in weird
+      // type inference issues during the compile
+      if (mill.client.ClientServer.isJava9OrAbove){
+        assert(eval(s"caffeine.test.compile"))
+        assert(eval(s"guava.test.compile"))
+        assert(eval(s"jcache.test.compile"))
+        assert(eval(s"simulator.test.compile"))
+      }
+    }
+
+  }
+}
diff --git a/integration/test/src/mill/integration/IntegrationTestSuite.scala b/integration/test/src/mill/integration/IntegrationTestSuite.scala
index d24261f3..721557c0 100644
--- a/integration/test/src/mill/integration/IntegrationTestSuite.scala
+++ b/integration/test/src/mill/integration/IntegrationTestSuite.scala
@@ -17,9 +17,7 @@ abstract class IntegrationTestSuite(repoKey: String, val workspaceSlug: String,
     wrapper
   }
 
-  def buildFiles: Seq[Path] = {
-    Seq(buildFilePath / "build.sc")
-  }
+  def buildFiles: Seq[Path] = ls.rec(buildFilePath)
 
   override def initWorkspace() = {
     super.initWorkspace()
diff --git a/integration/test/src/mill/integration/forked/Tests.scala b/integration/test/src/mill/integration/forked/Tests.scala
index 4a2e9f53..38c739ab 100644
--- a/integration/test/src/mill/integration/forked/Tests.scala
+++ b/integration/test/src/mill/integration/forked/Tests.scala
@@ -6,3 +6,4 @@ object BetterFilesTests extends mill.integration.BetterFilesTests(fork = true)
 object JawnTests extends mill.integration.JawnTests(fork = true)
 object UpickleTests extends mill.integration.UpickleTests(fork = true)
 object PlayJsonTests extends mill.integration.PlayJsonTests(fork = true)
+object CaffeineTests extends mill.integration.CaffeineTests(fork = true)
diff --git a/integration/test/src/mill/integration/local/Tests.scala b/integration/test/src/mill/integration/local/Tests.scala
index b4f78ee4..c1eba757 100644
--- a/integration/test/src/mill/integration/local/Tests.scala
+++ b/integration/test/src/mill/integration/local/Tests.scala
@@ -6,3 +6,4 @@ object BetterFilesTests extends mill.integration.BetterFilesTests(fork = false)
 object JawnTests extends mill.integration.JawnTests(fork = false)
 object UpickleTests extends mill.integration.UpickleTests(fork = false)
 object PlayJsonTests extends mill.integration.PlayJsonTests(fork = false)
+object CaffeineTests extends mill.integration.CaffeineTests(fork = false)
-- 
cgit v1.2.3