From dab5c351d1b5c31770a554af06b98a24d60f67c0 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 6 Sep 2020 05:56:25 -0400 Subject: [PATCH] scripted source-dependencies/java-class-inv --- .../java-class-invs/app/App.scala | 3 +++ .../java-class-invs/build.json | 18 ++++++++++++++++++ .../java-class-invs/changes/Std.scala | 5 +++++ .../java-class-invs/lib/LibIntf.java | 3 +++ .../java-class-invs/lib/LibUtil.scala | 3 +++ .../java-class-invs/std/Std.scala | 3 +++ .../source-dependencies/java-class-invs/test | 5 +++++ 7 files changed, 40 insertions(+) create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/app/App.scala create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/build.json create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/changes/Std.scala create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibIntf.java create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibUtil.scala create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/std/Std.scala create mode 100644 zinc/src/sbt-test/source-dependencies/java-class-invs/test diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/app/App.scala b/zinc/src/sbt-test/source-dependencies/java-class-invs/app/App.scala new file mode 100644 index 0000000000..d8cb96cbfa --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/app/App.scala @@ -0,0 +1,3 @@ +package pkg + +object App extends Std with LibIntf diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json b/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json new file mode 100644 index 0000000000..8cf3a0c7f5 --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/build.json @@ -0,0 +1,18 @@ +{ + "projects": [ + { + "name": "app", + "dependsOn": [ "std", "lib" ], + "scalaVersion": "2.13.3" + }, + { + "name": "lib", + "dependsOn": [ "std" ], + "scalaVersion": "2.13.3" + }, + { + "name": "std", + "scalaVersion": "2.13.3" + } + ] +} diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/changes/Std.scala b/zinc/src/sbt-test/source-dependencies/java-class-invs/changes/Std.scala new file mode 100644 index 0000000000..35e33e9b71 --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/changes/Std.scala @@ -0,0 +1,5 @@ +package pkg + +trait Std { + def x = 1 +} diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibIntf.java b/zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibIntf.java new file mode 100644 index 0000000000..97d72c5968 --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibIntf.java @@ -0,0 +1,3 @@ +package pkg; + +interface LibIntf {} diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibUtil.scala b/zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibUtil.scala new file mode 100644 index 0000000000..d0529d094c --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/lib/LibUtil.scala @@ -0,0 +1,3 @@ +package pkg + +class LibUtil extends Std diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/std/Std.scala b/zinc/src/sbt-test/source-dependencies/java-class-invs/std/Std.scala new file mode 100644 index 0000000000..7fd0cee072 --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/std/Std.scala @@ -0,0 +1,3 @@ +package pkg + +trait Std diff --git a/zinc/src/sbt-test/source-dependencies/java-class-invs/test b/zinc/src/sbt-test/source-dependencies/java-class-invs/test new file mode 100644 index 0000000000..4d011934b0 --- /dev/null +++ b/zinc/src/sbt-test/source-dependencies/java-class-invs/test @@ -0,0 +1,5 @@ +> app/compile + +$ copy-file changes/Std.scala std/Std.scala + +> app/compile