summaryrefslogtreecommitdiff
path: root/scalaplugin/src
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-05 17:34:36 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-05 17:34:36 -0800
commit7a6c80301fa5f405f1d9ffca2776b19cf9a29b9a (patch)
tree2f3f4375097756bded9dfbe8bd546b448b2cd394 /scalaplugin/src
parent011e8ef1059196a373a0eee32c58dfdaee3493f2 (diff)
downloadmill-7a6c80301fa5f405f1d9ffca2776b19cf9a29b9a.tar.gz
mill-7a6c80301fa5f405f1d9ffca2776b19cf9a29b9a.tar.bz2
mill-7a6c80301fa5f405f1d9ffca2776b19cf9a29b9a.zip
Break out reusable JVM specific stuff into its own file
Diffstat (limited to 'scalaplugin/src')
-rw-r--r--scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala10
-rw-r--r--scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala1
2 files changed, 9 insertions, 2 deletions
diff --git a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
index b28f1758..4e1bb50c 100644
--- a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
+++ b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
@@ -84,7 +84,7 @@ object Subproject{
PathRef(outputPath)
}
}
- def createJar(sourceDirs: T[Seq[PathRef]]) = ???
+
def resolveDependencies(repositories: Seq[Repository],
scalaVersion: String,
scalaBinaryVersion: String,
@@ -185,5 +185,11 @@ abstract class Subproject extends Cacher{
}
def classpath = T{ Seq(resources(), compiled()) }
-// val jar = T{ createJar(classpath) }
+ def jar = T{ modules.Jvm.jarUp(resources, compiled) }
+
+ @ammonite.main.Router.main
+ def run(mainClass: String) = {
+// val cp = forge
+// modules.Jvm.subprocess(mainClass, )
+ }
}
diff --git a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala b/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala
index 4b2f6844..39addd90 100644
--- a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala
+++ b/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala
@@ -54,6 +54,7 @@ object MetacircularTests extends TestSuite{
// val evaluated4 = evaluator.evaluate(OSet(Self.deps)).evaluated.collect(mapping)
val evaluated5 = evaluator.evaluate(OSet(Core.compiled)).evaluated.collect(mapping)
val evaluated6 = evaluator.evaluate(OSet(ScalaPlugin.compiled)).evaluated.collect(mapping)
+ val evaluated7 = evaluator.evaluate(OSet(ScalaPlugin.jar)).evaluated.collect(mapping)
// evaluated3
}
}