aboutsummaryrefslogtreecommitdiff
path: root/bridge/src/sbt-test/source-dependencies/canon
diff options
context:
space:
mode:
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/canon')
-rw-r--r--bridge/src/sbt-test/source-dependencies/canon/Use.scala3
-rw-r--r--bridge/src/sbt-test/source-dependencies/canon/actual/A.java4
-rw-r--r--bridge/src/sbt-test/source-dependencies/canon/actual/a.jarbin634 -> 0 bytes
-rw-r--r--bridge/src/sbt-test/source-dependencies/canon/build.sbt10
l---------bridge/src/sbt-test/source-dependencies/canon/lib/a.jar1
-rw-r--r--bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala17
-rw-r--r--bridge/src/sbt-test/source-dependencies/canon/test10
7 files changed, 0 insertions, 45 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/canon/Use.scala b/bridge/src/sbt-test/source-dependencies/canon/Use.scala
deleted file mode 100644
index fe9e21714..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/Use.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object Use {
- val x = A.x
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/canon/actual/A.java b/bridge/src/sbt-test/source-dependencies/canon/actual/A.java
deleted file mode 100644
index 693c5b932..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/actual/A.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// this is the source for the compiled class in a.jar
-public class A {
- public static final int x = 3;
-}
diff --git a/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar b/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar
deleted file mode 100644
index 5c63ca5e9..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/actual/a.jar
+++ /dev/null
Binary files differ
diff --git a/bridge/src/sbt-test/source-dependencies/canon/build.sbt b/bridge/src/sbt-test/source-dependencies/canon/build.sbt
deleted file mode 100644
index d23dff705..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/build.sbt
+++ /dev/null
@@ -1,10 +0,0 @@
-import complete.DefaultParsers._
-
-val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.")
-
-checkIterations := {
- val expected: Int = (Space ~> NatBasic).parsed
- val actual: Int = (compile in Compile).value.compilations.allCompilations.size
- assert(expected == actual, s"Expected $expected compilations, got $actual")
-}
-
diff --git a/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar b/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar
deleted file mode 120000
index 9fa4156a8..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/lib/a.jar
+++ /dev/null
@@ -1 +0,0 @@
-../actual/a.jar \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala
deleted file mode 100644
index 3433779b6..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/project/DottyInjectedPlugin.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import sbt._
-import Keys._
-
-object DottyInjectedPlugin extends AutoPlugin {
- override def requires = plugins.JvmPlugin
- override def trigger = allRequirements
-
- override val projectSettings = Seq(
- scalaVersion := "0.1-SNAPSHOT",
- scalaOrganization := "ch.epfl.lamp",
- scalacOptions += "-language:Scala2",
- scalaBinaryVersion := "2.11",
- autoScalaLibrary := false,
- libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
- scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
- )
-}
diff --git a/bridge/src/sbt-test/source-dependencies/canon/test b/bridge/src/sbt-test/source-dependencies/canon/test
deleted file mode 100644
index 13caf4871..000000000
--- a/bridge/src/sbt-test/source-dependencies/canon/test
+++ /dev/null
@@ -1,10 +0,0 @@
-# Tests that classpath entries that are different than their canonical representation are
-# handled properly. In particular, a symlink from lib/a.jar to lib/../actual/a.jar.0 is
-# available on the classpath and read by scalac. scalac 2.10.x does not interpret .jar.0
-# as a jar, so if sbt passes the canonical path, it will not be read.
-# This also verifies that compilation does not get repeatedly triggered by a mismatch in
-# paths.
-
-> compile
-> compile
-> checkIterations 1 \ No newline at end of file