diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2016-05-31 15:23:04 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-06-07 17:10:36 +0200 |
commit | 09b2f39731386cd5b3688d5c3badf75d956d4f6d (patch) | |
tree | d122fc0e96d6c1cd22d7e0d0b5ee523563d534e7 /bridge/src/sbt-test/source-dependencies/java-generic-workaround | |
parent | 030ff82070197f0c126f5c0287e076b0f6b6dd8d (diff) | |
download | dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.tar.gz dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.tar.bz2 dotty-09b2f39731386cd5b3688d5c3badf75d956d4f6d.zip |
Make the dotty-bridge sbt project a subproject of dotty
Note that the dotty-bridge tests will not be run automatically by `test`
which is short for `dotty/test`, to run the dotty-bridge tests, do in sbt:
> dotty-bridge/test
> dotty-bridge/scripted
Original history: https://github.com/smarter/dotty-bridge/commits/master
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/java-generic-workaround')
6 files changed, 48 insertions, 0 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java new file mode 100644 index 000000000..7ac3d1a41 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/A.java @@ -0,0 +1,7 @@ + +public class A<T> { + class B { + class C { + } + } +} diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java new file mode 100644 index 000000000..eec11ccea --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java @@ -0,0 +1,15 @@ +import javax.swing.DefaultRowSorter; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; + +public class DefaultTreeTableSorter<T extends TreeModel, C extends TreeColumnModel, I> + implements TreeTableSorter<T,C>, TreeTableSorter.SortCycle { + + public class NodeSorter extends DefaultRowSorter<T,I> implements SortCycle { + + protected TreeTableWrapper getTreeTableModelWrapper() { + return (TreeTableWrapper)getModelWrapper(); + } + protected abstract class TreeTableWrapper extends ModelWrapper<T,I> {} + } +} diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java new file mode 100644 index 000000000..bd66a91b8 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java @@ -0,0 +1 @@ +public interface TreeColumnModel {} diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java new file mode 100644 index 000000000..08b9f38f5 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java @@ -0,0 +1,5 @@ +import javax.swing.tree.TreeModel; + +public interface TreeTableSorter<T extends TreeModel, C extends TreeColumnModel> { + public interface SortCycle {} +} diff --git a/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/project/DottyInjectedPlugin.scala @@ -0,0 +1,17 @@ +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/java-generic-workaround/test b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test new file mode 100644 index 000000000..125967284 --- /dev/null +++ b/bridge/src/sbt-test/source-dependencies/java-generic-workaround/test @@ -0,0 +1,3 @@ +# generic signatures fails to parse due to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6476261 +# tests workaround for https://github.com/sbt/sbt/issues/1035 +> compile |