diff options
| -rw-r--r-- | build.sbt | 20 | ||||
| -rwxr-xr-x | build.sc | 67 | ||||
| -rw-r--r-- | core/src/main/scala/mill/define/Task.scala | 10 | ||||
| -rw-r--r-- | moduledefs/src/main/resources/scalac-plugin.xml | 4 | ||||
| -rw-r--r-- | moduledefs/src/main/scala/mill/moduledefs/AutoOverridePlugin.scala (renamed from plugin/src/main/scala/mill/plugin/AutoOverridePlugin.scala) | 4 | ||||
| -rw-r--r-- | moduledefs/src/main/scala/mill/moduledefs/Cacher.scala (renamed from plugin/src/main/scala/mill/plugin/Cacher.scala) | 4 | ||||
| -rw-r--r-- | plugin/src/main/resources/scalac-plugin.xml | 4 | ||||
| -rw-r--r-- | readme.md | 82 | ||||
| -rw-r--r-- | scalajslib/bridge_0_6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala (renamed from scalajsplugin/bridge_0_6/src/main/scala/mill/scalajsplugin/bridge/ScalaJSLinkerBridge.scala) | 2 | ||||
| -rw-r--r-- | scalajslib/bridge_1_0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala (renamed from scalajsplugin/bridge_1_0/src/main/scala/mill/scalajsplugin/bridge/ScalaJSLinkerBridge.scala) | 2 | ||||
| -rw-r--r-- | scalajslib/src/main/scala/mill/scalajslib/Lib.scala (renamed from scalajsplugin/src/main/scala/mill/scalajsplugin/Lib.scala) | 6 | ||||
| -rw-r--r-- | scalajslib/src/main/scala/mill/scalajslib/ScalaJSLinkerBridge.scala (renamed from scalajsplugin/src/main/scala/mill/scalajsplugin/ScalaJSLinkerBridge.scala) | 2 | ||||
| -rw-r--r-- | scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala (renamed from scalajsplugin/src/main/scala/mill/scalajsplugin/ScalaJSModule.scala) | 12 | ||||
| -rw-r--r-- | scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala (renamed from scalajsplugin/src/test/resource/hello-js-world/src/main/scala/Main.scala) | 0 | ||||
| -rw-r--r-- | scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala (renamed from scalajsplugin/src/test/scala/mill/scalajsplugin/HelloJSWorldTests.scala) | 8 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Dep.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/Dep.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/GenIdea.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala) | 4 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Lib.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/Lib.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Main.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/Main.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/Module.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala) | 24 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/TestRunner.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/package.scala | 5 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/Ivy.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/JsonFormatters.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/LocalPublisher.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/Pom.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/Pom.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/SonatypeHttpApi.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/SonatypePublisher.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/package.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/package.scala) | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/publish/settings.scala (renamed from scalaplugin/src/main/scala/mill/scalaplugin/publish/settings.scala) | 4 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/build.sbt (renamed from scalaplugin/src/test/resource/acyclic/build.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/project/build.properties (renamed from scalaplugin/src/test/resource/acyclic/project/build.properties) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/project/build.sbt (renamed from scalaplugin/src/test/resource/acyclic/project/build.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/main/resources/scalac-plugin.xml (renamed from scalaplugin/src/test/resource/acyclic/src/main/resources/scalac-plugin.xml) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/main/scala/acyclic/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/DependencyExtraction.scala (renamed from scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/DependencyExtraction.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/GraphAnalysis.scala (renamed from scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/GraphAnalysis.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/Plugin.scala (renamed from scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/Plugin.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/PluginPhase.scala (renamed from scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/PluginPhase.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/C.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/C.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/D.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/D.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/E.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/E.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/C.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/C.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/simple/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/simple/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/fail/simple/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/fail/simple/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/force/simple/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/force/simple/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/force/simple/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/force/simple/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/force/skip/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/force/skip/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/force/skip/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/force/skip/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/dag/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/dag/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/dag/C.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/C.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/dag/D.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/D.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/dag/E.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/E.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/java/SomeJava.java (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/java/SomeJava.java) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B1.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B1.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B2.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B2.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/single/pkg/package.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/single/pkg/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/simple/A.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/simple/A.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/resources/success/simple/B.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/resources/success/simple/B.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/scala/acyclic/CycleTests.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/scala/acyclic/CycleTests.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/acyclic/src/test/scala/acyclic/TestUtils.scala (renamed from scalaplugin/src/test/resource/acyclic/src/test/scala/acyclic/TestUtils.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/.gitignore (renamed from scalaplugin/src/test/resource/better-files/.gitignore) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/CHANGES.md (renamed from scalaplugin/src/test/resource/better-files/CHANGES.md) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/LICENSE (renamed from scalaplugin/src/test/resource/better-files/LICENSE) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/README.md (renamed from scalaplugin/src/test/resource/better-files/README.md) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/akka/README.md (renamed from scalaplugin/src/test/resource/better-files/akka/README.md) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/akka/src/main/scala/better/files/FileWatcher.scala (renamed from scalaplugin/src/test/resource/better-files/akka/src/main/scala/better/files/FileWatcher.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/akka/src/test/scala/better/files/FileWatcherSpec.scala (renamed from scalaplugin/src/test/resource/better-files/akka/src/test/scala/better/files/FileWatcherSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/benchmarks/README.md (renamed from scalaplugin/src/test/resource/better-files/benchmarks/README.md) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/benchmarks/src/main/java/better/files/ArrayBufferScanner.java (renamed from scalaplugin/src/test/resource/better-files/benchmarks/src/main/java/better/files/ArrayBufferScanner.java) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/benchmarks/src/main/scala/better/files/Scanners.scala (renamed from scalaplugin/src/test/resource/better-files/benchmarks/src/main/scala/better/files/Scanners.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/Benchmark.scala (renamed from scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/Benchmark.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/EncodingBenchmark.scala (renamed from scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/EncodingBenchmark.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/ScannerBenchmark.scala (renamed from scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/ScannerBenchmark.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/build.sbt (renamed from scalaplugin/src/test/resource/better-files/build.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/circle.yml (renamed from scalaplugin/src/test/resource/better-files/circle.yml) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Dsl.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Dsl.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/File.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/File.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/FileMonitor.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/FileMonitor.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Implicits.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Implicits.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/ManagedResource.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/ManagedResource.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/ReaderInputStream.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/ReaderInputStream.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Scanner.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Scanner.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/TeeOutputStream.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/TeeOutputStream.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/UnicodeCharset.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/UnicodeCharset.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/WriterOutputStream.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/WriterOutputStream.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/main/scala/better/files/package.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/test/scala/better/files/CommonSpec.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/CommonSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/test/scala/better/files/FileMonitorSpec.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/FileMonitorSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/test/scala/better/files/FileSpec.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/FileSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/test/scala/better/files/GlobSpec.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/GlobSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/test/scala/better/files/ManagedResourceSpec.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/ManagedResourceSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/core/src/test/scala/better/files/ScannerSpec.scala (renamed from scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/ScannerSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/project/Dependencies.scala (renamed from scalaplugin/src/test/resource/better-files/project/Dependencies.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/project/build.properties (renamed from scalaplugin/src/test/resource/better-files/project/build.properties) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/project/plugins.sbt (renamed from scalaplugin/src/test/resource/better-files/project/plugins.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/shapeless/src/main/scala/better/files/ShapelessScanner.scala (renamed from scalaplugin/src/test/resource/better-files/shapeless/src/main/scala/better/files/ShapelessScanner.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala (renamed from scalaplugin/src/test/resource/better-files/shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/site/index.html (renamed from scalaplugin/src/test/resource/better-files/site/index.html) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/better-files/site/tech_talk_preview.png (renamed from scalaplugin/src/test/resource/better-files/site/tech_talk_preview.png) | bin | 60942 -> 60942 bytes | |||
| -rw-r--r-- | scalalib/src/test/resource/better-files/version.sbt (renamed from scalaplugin/src/test/resource/better-files/version.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/hello-world/src/main/scala/Main.scala (renamed from scalaplugin/src/test/resource/hello-world/src/main/scala/Main.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/hello-world/src/main/scala/Result.scala (renamed from scalaplugin/src/test/resource/hello-world/src/main/scala/Result.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/.gitignore (renamed from scalaplugin/src/test/resource/jawn/.gitignore) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/.travis.yml (renamed from scalaplugin/src/test/resource/jawn/.travis.yml) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/README.md (renamed from scalaplugin/src/test/resource/jawn/README.md) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JParser.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JValue.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JValue.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JawnFacade.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JawnFacade.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/Renderer.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/Renderer.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/ArbitraryUtil.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/ArbitraryUtil.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/AstTest.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/AstTest.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/ParseCheck.scala (renamed from scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/ParseCheck.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/benchmark/build.sbt (renamed from scalaplugin/src/test/resource/jawn/benchmark/build.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/JmhBenchmarks.scala (renamed from scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/JmhBenchmarks.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/Parboiled.scala (renamed from scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/Parboiled.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/ParseLongBench.scala (renamed from scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/ParseLongBench.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/build.sbt (renamed from scalaplugin/src/test/resource/jawn/build.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/resources/utf8.json (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/resources/utf8.json) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/AsyncParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/AsyncParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBasedParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBasedParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBufferParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBufferParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ChannelParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ChannelParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharBasedParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharBasedParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharBuilder.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharBuilder.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharSequenceParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharSequenceParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Facade.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Facade.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/MutableFacade.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/MutableFacade.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/NullFacade.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/NullFacade.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SimpleFacade.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SimpleFacade.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/StringParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/StringParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SupportParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SupportParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SyncParser.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SyncParser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Syntax.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Syntax.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/ChannelSpec.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/ChannelSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/CharBuilderSpec.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/CharBuilderSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/JNumIndexCheck.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/JNumIndexCheck.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/SyntaxCheck.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/SyntaxCheck.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/TestUtil.scala (renamed from scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/TestUtil.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/project/ReleaseHelper.scala (renamed from scalaplugin/src/test/resource/jawn/project/ReleaseHelper.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/project/build.properties (renamed from scalaplugin/src/test/resource/jawn/project/build.properties) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/project/plugins.sbt (renamed from scalaplugin/src/test/resource/jawn/project/plugins.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/randjson.py (renamed from scalaplugin/src/test/resource/jawn/randjson.py) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/randjson2.py (renamed from scalaplugin/src/test/resource/jawn/randjson2.py) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/argonaut/src/main/scala/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/support/argonaut/src/main/scala/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/argonaut/src/test/scala/ParserSpec.scala (renamed from scalaplugin/src/test/resource/jawn/support/argonaut/src/test/scala/ParserSpec.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/json4s/src/main/scala/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/support/json4s/src/main/scala/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/play/src/main/scala/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/support/play/src/main/scala/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/rojoma-v3/src/main/scala/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/support/rojoma-v3/src/main/scala/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/rojoma/src/main/scala/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/support/rojoma/src/main/scala/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/support/spray/src/main/scala/Parser.scala (renamed from scalaplugin/src/test/resource/jawn/support/spray/src/main/scala/Parser.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/InvalidLong.scala (renamed from scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/InvalidLong.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/Slice.scala (renamed from scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/Slice.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/package.scala (renamed from scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/package.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/util/src/test/scala/jawn/util/ParseLongCheck.scala (renamed from scalaplugin/src/test/resource/jawn/util/src/test/scala/jawn/util/ParseLongCheck.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/util/src/test/scala/jawn/util/SliceCheck.scala (renamed from scalaplugin/src/test/resource/jawn/util/src/test/scala/jawn/util/SliceCheck.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/jawn/version.sbt (renamed from scalaplugin/src/test/resource/jawn/version.sbt) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resource/resolve-deps/src/main/scala/Main.scala (renamed from scalaplugin/src/test/resource/resolve-deps/src/main/scala/Main.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/AcyclicTests.scala (renamed from scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala) | 10 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/BetterFilesTests.scala (renamed from scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala) | 6 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala (renamed from scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala) | 10 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/JawnTests.scala (renamed from scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala) | 14 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala (renamed from scalaplugin/src/test/scala/mill/scalaplugin/ResolveDepsTests.scala) | 2 | ||||
| -rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/package.scala | 5 | ||||
| -rwxr-xr-x | test.sh | 8 |
194 files changed, 171 insertions, 170 deletions
@@ -20,7 +20,7 @@ val sharedSettings = Seq( val pluginSettings = Seq( scalacOptions in Test ++= { - val jarFile = (packageBin in (plugin, Compile)).value + val jarFile = (packageBin in (moduledefs, Compile)).value val addPlugin = "-Xplugin:" + jarFile.getAbsolutePath // add plugin timestamp to compiler options to trigger recompile of // main after editing the plugin. (Otherwise a 'clean' is needed.) @@ -81,7 +81,7 @@ lazy val bridge2_12_3 = bridge("2.12.3") lazy val bridge2_12_4 = bridge("2.12.4") lazy val core = project - .dependsOn(plugin) + .dependsOn(moduledefs) .settings( sharedSettings, pluginSettings, @@ -103,7 +103,7 @@ lazy val core = project } ) -lazy val plugin = project +lazy val moduledefs = project .settings( sharedSettings, libraryDependencies ++= Seq( @@ -124,21 +124,21 @@ val bridgeProps = Def.task{ for((k, v) <- mapping) yield s"-D$k=$v" } -lazy val scalaplugin = project +lazy val scalalib = project .dependsOn(core % "compile->compile;test->test") .settings( sharedSettings, pluginSettings, - name := "mill-scalaplugin", + name := "mill-scalalib", fork := true, baseDirectory in Test := (baseDirectory in Test).value / "..", javaOptions := bridgeProps.value.toSeq ) -lazy val scalajsplugin = project - .dependsOn(scalaplugin % "compile->compile;test->test") +lazy val scalajslib = project + .dependsOn(scalalib % "compile->compile;test->test") .settings( sharedSettings, - name := "mill-scalajsplugin", + name := "mill-scalajslib", fork in Test := true, baseDirectory in (Test, test) := (baseDirectory in (Test, test)).value / "..", javaOptions in (Test, test) := jsbridgeProps.value.toSeq @@ -146,7 +146,7 @@ lazy val scalajsplugin = project def jsbridge(binary: String, version: String) = Project( id = "scalajsbridge_" + binary.replace('.', '_'), - base = file("scalajsplugin/bridge_" + binary.replace('.', '_')) + base = file("scalajslib/bridge_" + binary.replace('.', '_')) ) .settings( organization := "com.lihaoyi", @@ -169,7 +169,7 @@ val jsbridgeProps = Def.task{ for((k, v) <- mapping) yield s"-D$k=$v" } lazy val bin = project - .dependsOn(scalaplugin, scalajsplugin) + .dependsOn(scalalib, scalajslib) .settings( sharedSettings, fork := true, @@ -4,32 +4,20 @@ import java.io.File import ammonite.ops._ import coursier.maven.MavenRepository import mill._ -import mill.scalaplugin._, publish._ +import mill.scalalib._, publish._ import mill.modules.Jvm.createAssembly -trait MillPublishModule extends PublishModule { - def publishWithFullScalaVersion = true - - def pomSettings = PomSettings( - organization = "com.lihaoyi", - description = artifactId(), - developers = Seq(Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi/mill")), - licenses = Seq(License("MIT License", "https://spdx.org/licenses/MIT.html#licenseText")), - scm = SCM("https://github.com/lihaoyi/mill", "scm:git:https://github.com/lihaoyi/mill.git"), - url = "https://github.com/lihaoyi/mill" - ) -} -object CompilerPlugin extends SbtScalaModule{ +object moduledefs extends SbtModule{ def scalaVersion = "2.12.4" - def basePath = pwd / 'plugin + def basePath = pwd / 'moduledefs def ivyDeps = Seq( Dep.Java("org.scala-lang", "scala-compiler", scalaVersion()), Dep("com.lihaoyi", "sourcecode", "0.1.4") ) } -trait MillModule extends SbtScalaModule{ outer => +trait MillModule extends SbtModule{ outer => def scalaVersion = "2.12.4" def compileIvyDeps = Seq(Dep("com.lihaoyi", "acyclic", "0.1.7")) @@ -47,16 +35,16 @@ trait MillModule extends SbtScalaModule{ outer => def defaultCommandName() = "forkTest" def forkArgs = T{ testArgs() } def projectDeps = - if (this == Core.test) Seq(Core) - else Seq(outer, Core.test) + if (this == core.test) Seq(core) + else Seq(outer, core.test) def ivyDeps = Seq(Dep("com.lihaoyi", "utest", "0.6.0")) def testFramework = "mill.UTestFramework" - def scalacPluginClasspath = super.scalacPluginClasspath() ++ Seq(CompilerPlugin.jar()) + def scalacPluginClasspath = super.scalacPluginClasspath() ++ Seq(moduledefs.jar()) } } -object Core extends MillModule { - def projectDeps = Seq(CompilerPlugin) +object core extends MillModule { + def projectDeps = Seq(moduledefs) def compileIvyDeps = Seq( Dep.Java("org.scala-lang", "scala-reflect", scalaVersion()) @@ -100,7 +88,7 @@ object Core extends MillModule { def jar = T{ val dest = T.ctx().dest ammonite.ops.mkdir(dest/ammonite.ops.up) - ammonite.ops.cp(Core.jar().path, dest) + ammonite.ops.cp(core.jar().path, dest) PathRef(dest) } @@ -109,7 +97,9 @@ object Core extends MillModule { val bridgeVersions = Seq("2.10.6", "2.11.8", "2.11.11", "2.12.3", "2.12.4") -val bridges = for(crossVersion <- mill.define.Cross(bridgeVersions:_*)) yield new MillPublishModule { +val bridges = for{ + crossVersion <- mill.define.Cross(bridgeVersions:_*) +} yield new PublishModule { def publishName = "mill-bridge" def publishVersion = "0.1" @@ -127,11 +117,22 @@ val bridges = for(crossVersion <- mill.define.Cross(bridgeVersions:_*)) yield ne Dep.Java("org.scala-lang", "scala-compiler", crossVersion), Dep.Java("org.scala-sbt", "compiler-interface", "1.0.5") ) + + def publishWithFullScalaVersion = true + + def pomSettings = PomSettings( + organization = "com.lihaoyi", + description = artifactId(), + developers = Seq(Developer("lihaoyi", "Li Haoyi", "https://github.com/lihaoyi/mill")), + licenses = Seq(License("MIT License", "https://spdx.org/licenses/MIT.html#licenseText")), + scm = SCM("https://github.com/lihaoyi/mill", "scm:git:https://github.com/lihaoyi/mill.git"), + url = "https://github.com/lihaoyi/mill" + ) } -object ScalaPlugin extends MillModule { - def projectDeps = Seq(Core) - def basePath = pwd / 'scalaplugin +object scalalib extends MillModule { + def projectDeps = Seq(core) + def basePath = pwd / 'scalalib def bridgeCompiles = mill.define.Task.traverse(bridges.items)(_._2.compile) def testArgs = T{ @@ -149,7 +150,7 @@ object ScalaPlugin extends MillModule { val jsbridges = for{ scalajsBinary <- mill.define.Cross("0.6", "1.0") } yield new MillModule{ - def basePath = pwd / 'scalajsplugin / s"bridge_${scalajsBinary.replace('.', '_')}" + def basePath = pwd / 'scalajslib / s"bridge_${scalajsBinary.replace('.', '_')}" val scalajsVersion = scalajsBinary match { case "0.6" => "0.6.21" case "1.0" => "1.0.0-M2" @@ -159,10 +160,10 @@ val jsbridges = for{ ) } -object ScalaJSPlugin extends MillModule { +object scalajslib extends MillModule { - def projectDeps = Seq(ScalaPlugin) - def basePath = pwd / 'scalajsplugin + def projectDeps = Seq(scalalib) + def basePath = pwd / 'scalajslib def bridgeClasspath(runDepClasspath: Seq[PathRef], classes: PathRef) = (runDepClasspath :+ classes).map(_.path).mkString(File.pathSeparator) @@ -176,7 +177,7 @@ object ScalaJSPlugin extends MillModule { } -val assemblyProjects = Seq(ScalaPlugin, ScalaJSPlugin) +val assemblyProjects = Seq(scalalib, scalajslib) def assemblyClasspath = mill.define.Task.traverse(assemblyProjects)(_.assemblyClasspath) @@ -195,11 +196,11 @@ def assemblyBase(classpath: Seq[Path], extraArgs: String) } def devAssembly = T{ - assemblyBase(assemblyClasspath().flatten, (ScalaPlugin.testArgs() ++ ScalaJSPlugin.testArgs()).mkString(" ")) + assemblyBase(assemblyClasspath().flatten, (scalalib.testArgs() ++ scalajslib.testArgs()).mkString(" ")) } def releaseAssembly = T{ assemblyBase(assemblyClasspath().flatten, "") } -def idea() = T.command{ mill.scalaplugin.GenIdea() }
\ No newline at end of file +def idea() = T.command{ mill.scalalib.GenIdea() }
\ No newline at end of file diff --git a/core/src/main/scala/mill/define/Task.scala b/core/src/main/scala/mill/define/Task.scala index 4ccb93b6..07f26b53 100644 --- a/core/src/main/scala/mill/define/Task.scala +++ b/core/src/main/scala/mill/define/Task.scala @@ -65,7 +65,7 @@ object Target extends TargetGenerated with Applicative.Applyer[Task, Task, Resul o: c.Expr[Overrides]): c.Expr[Target[T]] = { import c.universe._ c.Expr[Target[T]]( - mill.plugin.Cacher.wrapCached(c)( + mill.moduledefs.Cacher.wrapCached(c)( q"new ${weakTypeOf[TargetImpl[T]]}(${Applicative.impl0[Task, T, Ctx](c)(q"mill.eval.Result.Success($t)").tree}, $e.value, $cl.value, $n.value, upickle.default.ReadWriter($w.write, $r.read), $o.value)" ) ) @@ -89,7 +89,7 @@ object Target extends TargetGenerated with Applicative.Applyer[Task, Task, Resul o: c.Expr[Overrides]): c.Expr[Target[T]] = { import c.universe._ c.Expr[Target[T]]( - mill.plugin.Cacher.wrapCached(c)( + mill.moduledefs.Cacher.wrapCached(c)( q"new ${weakTypeOf[TargetImpl[T]]}(${Applicative.impl0[Task, T, Ctx](c)(t.tree).tree}, $e.value, $cl.value, $n.value, upickle.default.ReadWriter($w.write, $r.read), $o.value)" ) ) @@ -113,7 +113,7 @@ object Target extends TargetGenerated with Applicative.Applyer[Task, Task, Resul o: c.Expr[Overrides]): c.Expr[Target[T]] = { import c.universe._ c.Expr[Target[T]]( - mill.plugin.Cacher.wrapCached(c)( + mill.moduledefs.Cacher.wrapCached(c)( q"new ${weakTypeOf[TargetImpl[T]]}($t, $e.value, $cl.value, $n.value, upickle.default.ReadWriter($w.write, $r.read), $o.value)" ) ) @@ -166,7 +166,7 @@ object Target extends TargetGenerated with Applicative.Applyer[Task, Task, Resul import c.universe._ c.Expr[Persistent[T]]( - mill.plugin.Cacher.wrapCached(c)( + mill.moduledefs.Cacher.wrapCached(c)( q"new ${weakTypeOf[Persistent[T]]}(${Applicative.impl[Task, T, Ctx](c)(t).tree}, $e.value, $cl.value, $n.value, upickle.default.ReadWriter($w.write, $r.read), $o.value)" ) ) @@ -240,7 +240,7 @@ object Task { trait TaskModule extends Module { def defaultCommandName(): String } - trait Module extends mill.plugin.Cacher[Target]{ + trait Module extends mill.moduledefs.Cacher[Target]{ def wrapCached[T](t: Target[T], enclosing: String): Target[T] = t } diff --git a/moduledefs/src/main/resources/scalac-plugin.xml b/moduledefs/src/main/resources/scalac-plugin.xml new file mode 100644 index 00000000..48753a22 --- /dev/null +++ b/moduledefs/src/main/resources/scalac-plugin.xml @@ -0,0 +1,4 @@ +<plugin> + <name>auto-override-plugin</name> + <classname>mill.moduledefs.AutoOverridePlugin</classname> +</plugin>
\ No newline at end of file diff --git a/plugin/src/main/scala/mill/plugin/AutoOverridePlugin.scala b/moduledefs/src/main/scala/mill/moduledefs/AutoOverridePlugin.scala index ab9d8db0..5b33abbe 100644 --- a/plugin/src/main/scala/mill/plugin/AutoOverridePlugin.scala +++ b/moduledefs/src/main/scala/mill/moduledefs/AutoOverridePlugin.scala @@ -1,4 +1,4 @@ -package mill.plugin +package mill.moduledefs import scala.reflect.internal.Flags import scala.tools.nsc.io.VirtualFile @@ -32,7 +32,7 @@ class AutoOverridePlugin(val global: Global) extends Plugin { if (owner.isClass) Some(owner.asClass.baseClasses) else if (owner.isModule) Some(owner.asModule.baseClasses) else None - baseClasses.exists(_.exists(_.fullName == "mill.plugin.Cacher")) + baseClasses.exists(_.exists(_.fullName == "mill.moduledefs.Cacher")) } def apply(unit: global.CompilationUnit): Unit = { diff --git a/plugin/src/main/scala/mill/plugin/Cacher.scala b/moduledefs/src/main/scala/mill/moduledefs/Cacher.scala index 17f0a8d0..cea2ca41 100644 --- a/plugin/src/main/scala/mill/plugin/Cacher.scala +++ b/moduledefs/src/main/scala/mill/moduledefs/Cacher.scala @@ -1,4 +1,4 @@ -package mill.plugin +package mill.moduledefs import scala.collection.mutable import scala.reflect.macros.blackbox.Context @@ -22,7 +22,7 @@ object Cacher{ val owner = c.internal.enclosingOwner val ownerIsCacherClass = owner.owner.isClass && - owner.owner.asClass.baseClasses.exists(_.fullName == "mill.plugin.Cacher") + owner.owner.asClass.baseClasses.exists(_.fullName == "mill.moduledefs.Cacher") if (ownerIsCacherClass && owner.isMethod) q"this.cachedTarget($t)" else c.abort( diff --git a/plugin/src/main/resources/scalac-plugin.xml b/plugin/src/main/resources/scalac-plugin.xml deleted file mode 100644 index fb9a4404..00000000 --- a/plugin/src/main/resources/scalac-plugin.xml +++ /dev/null @@ -1,4 +0,0 @@ -<plugin> - <name>demo-plugin</name> - <classname>mill.plugin.AutoOverridePlugin</classname> -</plugin>
\ No newline at end of file @@ -22,26 +22,26 @@ core unit tests e.g.: ```bash -./bin/target/mill Core.compile -./bin/target/mill Core.test.compile -./bin/target/mill Core.test -./bin/target/mill ScalaPlugin.assembly +./bin/target/mill core.compile +./bin/target/mill core.test.compile +./bin/target/mill core.test +./bin/target/mill scalalib.assembly ``` There is already a `watch` option that looks for changes on files, e.g.: ```bash -./bin/target/mill --watch Core.compile +./bin/target/mill --watch core.compile ``` You can get Mill to show the JSON-structured output for a particular `Target` or `Command` using the `--show` flag: ```bash -./bin/target/mill --show Core.scalaVersion -./bin/target/mill --show Core.compile -./bin/target/mill --show Core.assemblyClasspath -./bin/target/mill --show Core.test +./bin/target/mill --show core.scalaVersion +./bin/target/mill --show core.compile +./bin/target/mill --show core.assemblyClasspath +./bin/target/mill --show core.test ``` Output will be generated into a the `./out` folder. @@ -51,7 +51,7 @@ file in the repository root, you can skip the assembly process and directly run it via: ```bash -sbt "~bin/test:run Core.test" +sbt "~bin/test:run core.test" sbt "~bin/test:run --repl" ``` @@ -82,34 +82,34 @@ Compiling (synthetic)/ammonite/predef/CodePredef.sc res0: build.type = build @ build. -!= Core ScalaPlugin bridges getClass isInstanceOf |> +!= core scalalib bridges getClass isInstanceOf |> == MillModule asInstanceOf equals hashCode toString -@ build.Core -res1: Core.type = ammonite.predef.$up.build$Core$@5600c124 +@ build.core +res1: core.type = ammonite.predef.$up.build$core$@5600c124 -@ Core -res2: Core.type = ammonite.predef.$up.build$Core$@5600c124 +@ core +res2: core.type = ammonite.predef.$up.build$core$@5600c124 -@ Core.scalaV +@ core.scalaV scalaVersion -@ Core.scalaVersion +@ core.scalaVersion res3: define.Target[String] = ammonite.predef.^.build.MillModule#scalaVersion@4b7d16 -@ Core.scalaVersion() -Running Core.scalaVersion +@ core.scalaVersion() +Running core.scalaVersion res4: String = "2.12.4" -@ Core.ivyDeps() -Running Core.ivyDeps -res5: Seq[scalaplugin.Dep] = List( +@ core.ivyDeps() +Running core.ivyDeps +res5: Seq[scalalib.Dep] = List( Scala( Dependency( Module("com.lihaoyi", "sourcecode", Map()), "0.1.4", ... -@ Core.ivyDeps().foreach(println) -Running Core.ivyDeps +@ core.ivyDeps().foreach(println) +Running core.ivyDeps Scala(Dependency(com.lihaoyi:sourcecode,0.1.4,,Set(),Attributes(,),false,true)) Scala(Dependency(com.lihaoyi:pprint,0.5.3,,Set(),Attributes(,),false,true)) Point(Dependency(com.lihaoyi:ammonite,1.0.3,,Set(),Attributes(,),false,true)) @@ -133,13 +133,13 @@ Within each `Module` you can define 3 type of task: ### Structure of the `out/` folder -The `out/` folder is structured with one folder per `Target`/`Command`, that is -run, e.g.: +The `out/` folder contains all the generated files & metadata for your build. It +is structured with one folder per `Target`/`Command`, that is run, e.g.: -- `out/Core/compile/` -- `out/Core/test/compile/` -- `out/Core/test/forkTest/` -- `out/ScalaPlugin/compile/` +- `out/core/compile/` +- `out/core/test/compile/` +- `out/core/test/forkTest/` +- `out/scalalib/compile/` Each folder currently contains the following files: @@ -149,12 +149,12 @@ Each folder currently contains the following files: conflicting with other `Task`s, but files within `dest/` can be named arbitrarily. -- `log`: the `stdout`/`stderr` of the `Task`. This is streamed to the console - during evaluation, but you use `log` if you want to retrieve it later +- `log`: the `stdout`/`stderr` of the `Task`. This is also streamed to the + console during evaluation. - `meta.json`: the cache-key and JSON-serialized return-value of the `Target`/`Command`. The return-value can also be retrieved via `mill --show - Core.compile`. Binary blobs are typically not included in `meta.json`, and + core.compile`. Binary blobs are typically not included in `meta.json`, and instead stored as separate binary files in `dest/` which are then referenced by `meta.json` via `PathRef`s @@ -220,8 +220,8 @@ able to run it. Cross builds, using the `Cross` data structure, are just another kind of node in the object hierarchy. The only difference is syntax: from the command line you'd -run something via `mill Core.cross[a].printIt` while from code you use -`Core.cross("a").printIt` due to different restrictions in Scala/Bash syntax. +run something via `mill core.cross[a].printIt` while from code you use +`core.cross("a").printIt` due to different restrictions in Scala/Bash syntax. ### Caching by default @@ -246,7 +246,7 @@ process, and that a new process must be able to re-construct the in-memory data structures where a previous process left off, in order to continue the build. Re-construction is done via the hierarchical nature of the build: each `Target` -`Foo.bar.baz` has a fixed position in the build hierarchy, and thus a fixed +`foo.bar.baz` has a fixed position in the build hierarchy, and thus a fixed position on disk `out/foo/bar/baz/meta.json`. When the old process dies and a new process starts, there will be a new instance of `Target` with the same implementation code and same position in the build hierarchy: this new `Target` @@ -364,15 +364,15 @@ The module hierarchy is the graph of objects, starting from the root of the the `Target`s you can run. A `Target`'s position in the module hierarchy tells you many things. For -example, a `Target` at position `Core.test.compile` would: +example, a `Target` at position `core.test.compile` would: -- Cache output metadata at `out/Core/test/compile/meta.json` +- Cache output metadata at `out/core/test/compile/meta.json` -- Output files to the folder `out/Core/test/compile/dest/` +- Output files to the folder `out/core/test/compile/dest/` -- Be runnable from the command-line via `mill Core.test.compile` +- Be runnable from the command-line via `mill core.test.compile` -- Be referenced programmatically (from other `Target`s) via `Core.test.compile` +- Be referenced programmatically (from other `Target`s) via `core.test.compile` From the position of any `Target` within the object hierarchy, you immediately know how to run it, find it's output files, find any caches, or refer to it from diff --git a/scalajsplugin/bridge_0_6/src/main/scala/mill/scalajsplugin/bridge/ScalaJSLinkerBridge.scala b/scalajslib/bridge_0_6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala index 82295740..4826b1cd 100644 --- a/scalajsplugin/bridge_0_6/src/main/scala/mill/scalajsplugin/bridge/ScalaJSLinkerBridge.scala +++ b/scalajslib/bridge_0_6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala @@ -1,5 +1,5 @@ package mill -package scalajsplugin +package scalajslib package bridge import java.io.File diff --git a/scalajsplugin/bridge_1_0/src/main/scala/mill/scalajsplugin/bridge/ScalaJSLinkerBridge.scala b/scalajslib/bridge_1_0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala index 7d54ae52..ef896726 100644 --- a/scalajsplugin/bridge_1_0/src/main/scala/mill/scalajsplugin/bridge/ScalaJSLinkerBridge.scala +++ b/scalajslib/bridge_1_0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala @@ -1,5 +1,5 @@ package mill -package scalajsplugin +package scalajslib package bridge import java.io.File diff --git a/scalajsplugin/src/main/scala/mill/scalajsplugin/Lib.scala b/scalajslib/src/main/scala/mill/scalajslib/Lib.scala index 980a728a..3de37962 100644 --- a/scalajsplugin/src/main/scala/mill/scalajsplugin/Lib.scala +++ b/scalajslib/src/main/scala/mill/scalajslib/Lib.scala @@ -1,12 +1,12 @@ package mill -package scalajsplugin +package scalajslib import java.io.File import java.net.URLClassLoader import ammonite.ops.{Path, mkdir, rm, _} import mill.eval.PathRef -import mill.scalaplugin.Dep +import mill.scalalib.Dep import mill.util.Ctx import scala.collection.breakOut @@ -27,7 +27,7 @@ object Lib { case Some((`classloaderSig`, linker)) => linker case _ => val cl = new URLClassLoader(classPath.map(_.toIO.toURI.toURL).toArray) - val bridge = cl.loadClass("mill.scalajsplugin.bridge.ScalaJSLinkerBridge") + val bridge = cl.loadClass("mill.scalajslib.bridge.ScalaJSLinkerBridge") .getDeclaredConstructor().newInstance().asInstanceOf[ { def link(sources: Array[File], libraries: Array[File], dest: File, main: String, fullOpt: Boolean): Unit }] diff --git a/scalajsplugin/src/main/scala/mill/scalajsplugin/ScalaJSLinkerBridge.scala b/scalajslib/src/main/scala/mill/scalajslib/ScalaJSLinkerBridge.scala index 1aa8da8c..448cc16a 100644 --- a/scalajsplugin/src/main/scala/mill/scalajsplugin/ScalaJSLinkerBridge.scala +++ b/scalajslib/src/main/scala/mill/scalajslib/ScalaJSLinkerBridge.scala @@ -1,4 +1,4 @@ -package mill.scalajsplugin +package mill.scalajslib import java.io.File diff --git a/scalajsplugin/src/main/scala/mill/scalajsplugin/ScalaJSModule.scala b/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala index c3e8a89d..ed0a2c85 100644 --- a/scalajsplugin/src/main/scala/mill/scalajsplugin/ScalaJSModule.scala +++ b/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala @@ -1,15 +1,15 @@ package mill -package scalajsplugin +package scalajslib import java.io.File import ammonite.ops.Path import mill.eval.Result.Success -import mill.scalajsplugin.Lib._ -import mill.scalaplugin.Lib.resolveDependencies -import mill.scalaplugin.{Dep, PublishModule, ScalaModule, TestScalaModule} +import mill.scalajslib.Lib._ +import mill.scalalib.Lib.resolveDependencies +import mill.scalalib.{Dep, PublishModule, Module, TestModule} -trait ScalaJSModule extends ScalaModule { outer => +trait ScalaJSModule extends scalalib.Module { outer => def scalaJSVersion: T[String] @@ -66,4 +66,4 @@ trait ScalaJSModule extends ScalaModule { outer => } -trait TestScalaJSModule extends ScalaJSModule with TestScalaModule
\ No newline at end of file +trait TestScalaJSModule extends ScalaJSModule with TestModule
\ No newline at end of file diff --git a/scalajsplugin/src/test/resource/hello-js-world/src/main/scala/Main.scala b/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala index 60cef56d..60cef56d 100644 --- a/scalajsplugin/src/test/resource/hello-js-world/src/main/scala/Main.scala +++ b/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala diff --git a/scalajsplugin/src/test/scala/mill/scalajsplugin/HelloJSWorldTests.scala b/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala index e199c1da..ad392c42 100644 --- a/scalajsplugin/src/test/scala/mill/scalajsplugin/HelloJSWorldTests.scala +++ b/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala @@ -1,4 +1,4 @@ -package mill.scalajsplugin +package mill.scalajslib import java.io.{FileReader, StringWriter} import java.util.jar.JarFile @@ -8,8 +8,8 @@ import ammonite.ops._ import mill._ import mill.define.Cross import mill.discover.Discovered -import mill.scalaplugin.PublishModule -import mill.scalaplugin.publish.{Developer, License, PomSettings, SCM} +import mill.scalalib.PublishModule +import mill.scalalib.publish.{Developer, License, PomSettings, SCM} import mill.util.TestEvaluator import utest._ @@ -47,7 +47,7 @@ object HelloJSWorld { object HelloJSWorldTests extends TestSuite { - val srcPath = pwd / 'scalajsplugin / 'src / 'test / 'resource / "hello-js-world" + val srcPath = pwd / 'scalajslib / 'src / 'test / 'resource / "hello-js-world" val workspacePath = pwd / 'target / 'workspace / "hello-js-world" val outputPath = workspacePath / 'out val mainObject = workspacePath / 'src / 'main / 'scala / "Main.scala" diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/Dep.scala b/scalalib/src/main/scala/mill/scalalib/Dep.scala index e8cf0387..3d4c43ac 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/Dep.scala +++ b/scalalib/src/main/scala/mill/scalalib/Dep.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib import mill.util.JsonFormatters._ import upickle.default.{macroRW, ReadWriter => RW} sealed trait Dep diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala b/scalalib/src/main/scala/mill/scalalib/GenIdea.scala index d6cd0f7a..6fd5031a 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala +++ b/scalalib/src/main/scala/mill/scalalib/GenIdea.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib import ammonite.ops._ import mill.define.Target @@ -30,7 +30,7 @@ object GenIdea { val modules = Mirror .traverse(evaluator.mapping.base, evaluator.mapping.mirror){ (h, p) => h.node(evaluator.mapping.base, p.reverse.map{case Mirror.Segment.Cross(vs) => vs.toList case _ => Nil}.toList) match { - case m: ScalaModule => Seq(p -> m) + case m: Module => Seq(p -> m) case _ => Nil } } diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/Lib.scala b/scalalib/src/main/scala/mill/scalalib/Lib.scala index de1906ab..55c28a06 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/Lib.scala +++ b/scalalib/src/main/scala/mill/scalalib/Lib.scala @@ -1,5 +1,5 @@ package mill -package scalaplugin +package scalalib import java.io.File import java.net.URLClassLoader diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/Main.scala b/scalalib/src/main/scala/mill/scalalib/Main.scala index c54430e7..584fe9d1 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/Main.scala +++ b/scalalib/src/main/scala/mill/scalalib/Main.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib object Main { def main(args: Array[String]): Unit = { diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalalib/src/main/scala/mill/scalalib/Module.scala index 4fe3ebc2..1ff4c240 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalalib/src/main/scala/mill/scalalib/Module.scala @@ -1,5 +1,5 @@ package mill -package scalaplugin +package scalalib import ammonite.ops._ import coursier.{Cache, MavenRepository, Repository} @@ -10,7 +10,7 @@ import mill.modules.Jvm import mill.modules.Jvm.{createAssembly, createJar, interactiveSubprocess, subprocess} import Lib._ import sbt.testing.Status -object TestScalaModule{ +object TestModule{ def handleResults(doneMsg: String, results: Seq[TestRunner.Result]) = { if (results.count(Set(Status.Error, Status.Failure)) == 0) Result.Success((doneMsg, results)) else { @@ -20,7 +20,7 @@ object TestScalaModule{ } } } -trait TestScalaModule extends ScalaModule with TaskModule { +trait TestModule extends Module with TaskModule { override def defaultCommandName() = "test" def testFramework: T[String] @@ -31,7 +31,7 @@ trait TestScalaModule extends ScalaModule with TaskModule { val outputPath = T.ctx().dest/"out.json" Jvm.subprocess( - mainClass = "mill.scalaplugin.TestRunner", + mainClass = "mill.scalalib.TestRunner", classPath = Jvm.gatherClassloaderJars(), jvmOptions = forkArgs(), options = Seq( @@ -46,7 +46,7 @@ trait TestScalaModule extends ScalaModule with TaskModule { val jsonOutput = upickle.json.read(outputPath.toIO) val (doneMsg, results) = upickle.default.readJs[(String, Seq[TestRunner.Result])](jsonOutput) - TestScalaModule.handleResults(doneMsg, results) + TestModule.handleResults(doneMsg, results) } def test(args: String*) = T.command{ @@ -56,13 +56,13 @@ trait TestScalaModule extends ScalaModule with TaskModule { Seq(compile().classes.path), args ) - TestScalaModule.handleResults(doneMsg, results) + TestModule.handleResults(doneMsg, results) } } -trait ScalaModule extends Module with TaskModule { outer => +trait Module extends mill.Module with TaskModule { outer => def defaultCommandName() = "run" - trait Tests extends TestScalaModule{ + trait Tests extends TestModule{ def scalaVersion = outer.scalaVersion() override def projectDeps = Seq(outer) } @@ -84,7 +84,7 @@ trait ScalaModule extends Module with TaskModule { outer => MavenRepository("https://repo1.maven.org/maven2") ) - def projectDeps = Seq.empty[ScalaModule] + def projectDeps = Seq.empty[Module] def depClasspath = T{ Seq.empty[PathRef] } @@ -281,8 +281,8 @@ trait ScalaModule extends Module with TaskModule { outer => } -trait PublishModule extends ScalaModule { outer => - import mill.scalaplugin.publish._ +trait PublishModule extends Module { outer => + import mill.scalalib.publish._ def pomSettings: T[PomSettings] def publishVersion: T[String] = "0.0.1-SNAPSHOT" @@ -344,7 +344,7 @@ trait PublishModule extends ScalaModule { outer => } -trait SbtScalaModule extends ScalaModule { outer => +trait SbtModule extends Module { outer => def basePath: Path override def sources = T.source{ basePath / 'src / 'main / 'scala } override def resources = T.source{ basePath / 'src / 'main / 'resources } diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala index 8819d452..7d42bdea 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala +++ b/scalalib/src/main/scala/mill/scalalib/TestRunner.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib import java.io.FileInputStream import java.lang.annotation.Annotation diff --git a/scalalib/src/main/scala/mill/scalalib/package.scala b/scalalib/src/main/scala/mill/scalalib/package.scala new file mode 100644 index 00000000..1bad9226 --- /dev/null +++ b/scalalib/src/main/scala/mill/scalalib/package.scala @@ -0,0 +1,5 @@ +package mill + +package object scalalib { + +} diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/Ivy.scala b/scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala index 5b2276e1..ff21c9ac 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/Ivy.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish import scala.xml.PrettyPrinter diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/JsonFormatters.scala b/scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala index e4aed0ea..cf1af557 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/JsonFormatters.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish import upickle.default.{ReadWriter => RW} diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/LocalPublisher.scala b/scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala index acec6249..a9957e5c 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/LocalPublisher.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish import ammonite.ops._ diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/Pom.scala b/scalalib/src/main/scala/mill/scalalib/publish/Pom.scala index fab6c624..32ad036a 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/Pom.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/Pom.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish import scala.xml.{Elem, NodeSeq, PrettyPrinter} diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/SonatypeHttpApi.scala b/scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala index abf65cf6..8ccdf3ea 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/SonatypeHttpApi.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish import java.util.Base64 diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/SonatypePublisher.scala b/scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala index 90a39745..0749b0c5 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/SonatypePublisher.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish import java.math.BigInteger import java.security.MessageDigest diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/package.scala b/scalalib/src/main/scala/mill/scalalib/publish/package.scala index 1b405b90..99eeec14 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/package.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/package.scala @@ -1,3 +1,3 @@ -package mill.scalaplugin +package mill.scalalib package object publish extends JsonFormatters diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/publish/settings.scala b/scalalib/src/main/scala/mill/scalalib/publish/settings.scala index e13825ab..eb0a44b6 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/publish/settings.scala +++ b/scalalib/src/main/scala/mill/scalalib/publish/settings.scala @@ -1,6 +1,6 @@ -package mill.scalaplugin.publish +package mill.scalalib.publish -import mill.scalaplugin.Dep +import mill.scalalib.Dep case class Artifact(group: String, id: String, version: String) { def isSnapshot: Boolean = version.endsWith("-SNAPSHOT") diff --git a/scalaplugin/src/test/resource/acyclic/build.sbt b/scalalib/src/test/resource/acyclic/build.sbt index 3fd0f8e4..3fd0f8e4 100644 --- a/scalaplugin/src/test/resource/acyclic/build.sbt +++ b/scalalib/src/test/resource/acyclic/build.sbt diff --git a/scalaplugin/src/test/resource/acyclic/project/build.properties b/scalalib/src/test/resource/acyclic/project/build.properties index 817bc38d..817bc38d 100644 --- a/scalaplugin/src/test/resource/acyclic/project/build.properties +++ b/scalalib/src/test/resource/acyclic/project/build.properties diff --git a/scalaplugin/src/test/resource/acyclic/project/build.sbt b/scalalib/src/test/resource/acyclic/project/build.sbt index 7a1f37db..7a1f37db 100644 --- a/scalaplugin/src/test/resource/acyclic/project/build.sbt +++ b/scalalib/src/test/resource/acyclic/project/build.sbt diff --git a/scalaplugin/src/test/resource/acyclic/src/main/resources/scalac-plugin.xml b/scalalib/src/test/resource/acyclic/src/main/resources/scalac-plugin.xml index 7fd6e95b..7fd6e95b 100644 --- a/scalaplugin/src/test/resource/acyclic/src/main/resources/scalac-plugin.xml +++ b/scalalib/src/test/resource/acyclic/src/main/resources/scalac-plugin.xml diff --git a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/package.scala b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/package.scala index 0d656160..0d656160 100644 --- a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/package.scala +++ b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/DependencyExtraction.scala b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/DependencyExtraction.scala index 46aacc2b..46aacc2b 100644 --- a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/DependencyExtraction.scala +++ b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/DependencyExtraction.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/GraphAnalysis.scala b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/GraphAnalysis.scala index bf72ce39..bf72ce39 100644 --- a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/GraphAnalysis.scala +++ b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/GraphAnalysis.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/Plugin.scala b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/Plugin.scala index 257894c9..257894c9 100644 --- a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/Plugin.scala +++ b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/Plugin.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/PluginPhase.scala b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/PluginPhase.scala index eaee91a7..eaee91a7 100644 --- a/scalaplugin/src/test/resource/acyclic/src/main/scala/acyclic/plugin/PluginPhase.scala +++ b/scalalib/src/test/resource/acyclic/src/main/scala/acyclic/plugin/PluginPhase.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/A.scala index a0ff0100..a0ff0100 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/B.scala index d1004f5a..d1004f5a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/C.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/C.scala index 9aebe3a0..9aebe3a0 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/C.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/C.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/D.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/D.scala index 9c148b0a..9c148b0a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/D.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/D.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/E.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/E.scala index 00551a06..00551a06 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/E.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicgraph/E.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A1.scala index 530e7820..530e7820 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A2.scala index 95606566..95606566 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/A2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/package.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/package.scala index 9ee69111..9ee69111 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/package.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/a/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B1.scala index 9b9de725..9b9de725 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B2.scala index 87cabd93..87cabd93 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/B2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/package.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/package.scala index 5f6d9041..5f6d9041 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/package.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/cyclicpackage/b/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/A.scala index d8d118b6..d8d118b6 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/B.scala index 114d6197..114d6197 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C1.scala index be4eecf8..be4eecf8 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C2.scala index be3e0c63..be3e0c63 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/C2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/package.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/package.scala index 295a9e7a..295a9e7a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/package.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/halfpackagecycle/c/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/A.scala index ec4fa106..ec4fa106 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/B.scala index f9f8450a..f9f8450a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/C.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/C.scala index 986baaf3..986baaf3 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/indirect/C.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/indirect/C.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/simple/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/simple/A.scala index e1f95ae9..e1f95ae9 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/simple/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/simple/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/simple/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/fail/simple/B.scala index fa9ee63f..fa9ee63f 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/fail/simple/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/fail/simple/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/simple/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/force/simple/A.scala index 24a2a633..24a2a633 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/simple/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/force/simple/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/simple/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/force/simple/B.scala index 50c5d305..50c5d305 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/simple/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/force/simple/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/skip/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/force/skip/A.scala index 3f2464cd..3f2464cd 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/skip/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/force/skip/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/skip/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/force/skip/B.scala index b00c6db2..b00c6db2 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/force/skip/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/force/skip/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/A.scala index 902ee5fe..902ee5fe 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/B.scala index 203707ed..203707ed 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/cyclicunmarked/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/A.scala index c9a27490..c9a27490 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/B.scala index 3858e677..3858e677 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/C.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/C.scala index c4635adf..c4635adf 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/C.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/C.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/D.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/D.scala index 3ab67e39..3ab67e39 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/D.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/D.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/E.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/E.scala index 4148d75a..4148d75a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/dag/E.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/dag/E.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/java/SomeJava.java b/scalalib/src/test/resource/acyclic/src/test/resources/success/java/SomeJava.java index cad93696..cad93696 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/java/SomeJava.java +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/java/SomeJava.java diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A1.scala index 3d5bc5b3..3d5bc5b3 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A2.scala index 88ee4a03..88ee4a03 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/A2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/package.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/package.scala index 54f98aff..54f98aff 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/package.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/a/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B1.scala index 074f808a..074f808a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B2.scala index 6e4dfdd5..6e4dfdd5 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/halfacyclic/b/B2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A1.scala index 583e6c68..583e6c68 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A2.scala index 65f656a4..65f656a4 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/A2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/package.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/package.scala index 165fda66..165fda66 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/package.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/innercycle/a/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A1.scala index 3158f120..3158f120 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A2.scala index 1c36fe2a..1c36fe2a 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/a/A2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B1.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B1.scala index 33e10fc1..33e10fc1 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B1.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B1.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B2.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B2.scala index 57e324ce..57e324ce 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B2.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/mutualcyclic/b/B2.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/single/pkg/package.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/single/pkg/package.scala index c39b5e62..c39b5e62 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/pkg/single/pkg/package.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/pkg/single/pkg/package.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/simple/A.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/simple/A.scala index 24b9d0d3..24b9d0d3 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/simple/A.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/simple/A.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/simple/B.scala b/scalalib/src/test/resource/acyclic/src/test/resources/success/simple/B.scala index b7ca5335..b7ca5335 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/resources/success/simple/B.scala +++ b/scalalib/src/test/resource/acyclic/src/test/resources/success/simple/B.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/scala/acyclic/CycleTests.scala b/scalalib/src/test/resource/acyclic/src/test/scala/acyclic/CycleTests.scala index ff831aad..ff831aad 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/scala/acyclic/CycleTests.scala +++ b/scalalib/src/test/resource/acyclic/src/test/scala/acyclic/CycleTests.scala diff --git a/scalaplugin/src/test/resource/acyclic/src/test/scala/acyclic/TestUtils.scala b/scalalib/src/test/resource/acyclic/src/test/scala/acyclic/TestUtils.scala index 7bff8248..7bff8248 100644 --- a/scalaplugin/src/test/resource/acyclic/src/test/scala/acyclic/TestUtils.scala +++ b/scalalib/src/test/resource/acyclic/src/test/scala/acyclic/TestUtils.scala diff --git a/scalaplugin/src/test/resource/better-files/.gitignore b/scalalib/src/test/resource/better-files/.gitignore index 6f460f93..6f460f93 100644 --- a/scalaplugin/src/test/resource/better-files/.gitignore +++ b/scalalib/src/test/resource/better-files/.gitignore diff --git a/scalaplugin/src/test/resource/better-files/CHANGES.md b/scalalib/src/test/resource/better-files/CHANGES.md index 4103ef04..4103ef04 100644 --- a/scalaplugin/src/test/resource/better-files/CHANGES.md +++ b/scalalib/src/test/resource/better-files/CHANGES.md diff --git a/scalaplugin/src/test/resource/better-files/LICENSE b/scalalib/src/test/resource/better-files/LICENSE index a63964f8..a63964f8 100644 --- a/scalaplugin/src/test/resource/better-files/LICENSE +++ b/scalalib/src/test/resource/better-files/LICENSE diff --git a/scalaplugin/src/test/resource/better-files/README.md b/scalalib/src/test/resource/better-files/README.md index 9877c3bc..9877c3bc 100644 --- a/scalaplugin/src/test/resource/better-files/README.md +++ b/scalalib/src/test/resource/better-files/README.md diff --git a/scalaplugin/src/test/resource/better-files/akka/README.md b/scalalib/src/test/resource/better-files/akka/README.md index 391cec2e..391cec2e 100644 --- a/scalaplugin/src/test/resource/better-files/akka/README.md +++ b/scalalib/src/test/resource/better-files/akka/README.md diff --git a/scalaplugin/src/test/resource/better-files/akka/src/main/scala/better/files/FileWatcher.scala b/scalalib/src/test/resource/better-files/akka/src/main/scala/better/files/FileWatcher.scala index 66594d20..66594d20 100644 --- a/scalaplugin/src/test/resource/better-files/akka/src/main/scala/better/files/FileWatcher.scala +++ b/scalalib/src/test/resource/better-files/akka/src/main/scala/better/files/FileWatcher.scala diff --git a/scalaplugin/src/test/resource/better-files/akka/src/test/scala/better/files/FileWatcherSpec.scala b/scalalib/src/test/resource/better-files/akka/src/test/scala/better/files/FileWatcherSpec.scala index 014373cd..014373cd 100644 --- a/scalaplugin/src/test/resource/better-files/akka/src/test/scala/better/files/FileWatcherSpec.scala +++ b/scalalib/src/test/resource/better-files/akka/src/test/scala/better/files/FileWatcherSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/benchmarks/README.md b/scalalib/src/test/resource/better-files/benchmarks/README.md index ed092ece..ed092ece 100644 --- a/scalaplugin/src/test/resource/better-files/benchmarks/README.md +++ b/scalalib/src/test/resource/better-files/benchmarks/README.md diff --git a/scalaplugin/src/test/resource/better-files/benchmarks/src/main/java/better/files/ArrayBufferScanner.java b/scalalib/src/test/resource/better-files/benchmarks/src/main/java/better/files/ArrayBufferScanner.java index 50550704..50550704 100644 --- a/scalaplugin/src/test/resource/better-files/benchmarks/src/main/java/better/files/ArrayBufferScanner.java +++ b/scalalib/src/test/resource/better-files/benchmarks/src/main/java/better/files/ArrayBufferScanner.java diff --git a/scalaplugin/src/test/resource/better-files/benchmarks/src/main/scala/better/files/Scanners.scala b/scalalib/src/test/resource/better-files/benchmarks/src/main/scala/better/files/Scanners.scala index 791e6039..791e6039 100644 --- a/scalaplugin/src/test/resource/better-files/benchmarks/src/main/scala/better/files/Scanners.scala +++ b/scalalib/src/test/resource/better-files/benchmarks/src/main/scala/better/files/Scanners.scala diff --git a/scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/Benchmark.scala b/scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/Benchmark.scala index 68b734e1..68b734e1 100644 --- a/scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/Benchmark.scala +++ b/scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/Benchmark.scala diff --git a/scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/EncodingBenchmark.scala b/scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/EncodingBenchmark.scala index aa09bc77..aa09bc77 100644 --- a/scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/EncodingBenchmark.scala +++ b/scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/EncodingBenchmark.scala diff --git a/scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/ScannerBenchmark.scala b/scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/ScannerBenchmark.scala index 83082b9a..83082b9a 100644 --- a/scalaplugin/src/test/resource/better-files/benchmarks/src/test/scala/better/files/ScannerBenchmark.scala +++ b/scalalib/src/test/resource/better-files/benchmarks/src/test/scala/better/files/ScannerBenchmark.scala diff --git a/scalaplugin/src/test/resource/better-files/build.sbt b/scalalib/src/test/resource/better-files/build.sbt index a3ae7a81..a3ae7a81 100644 --- a/scalaplugin/src/test/resource/better-files/build.sbt +++ b/scalalib/src/test/resource/better-files/build.sbt diff --git a/scalaplugin/src/test/resource/better-files/circle.yml b/scalalib/src/test/resource/better-files/circle.yml index 0ca8d9b9..0ca8d9b9 100644 --- a/scalaplugin/src/test/resource/better-files/circle.yml +++ b/scalalib/src/test/resource/better-files/circle.yml diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Dsl.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Dsl.scala index 3bacd91d..3bacd91d 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Dsl.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Dsl.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/File.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/File.scala index eb11cd93..eb11cd93 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/File.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/File.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/FileMonitor.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/FileMonitor.scala index f6f139f2..f6f139f2 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/FileMonitor.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/FileMonitor.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Implicits.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Implicits.scala index 322b5f40..322b5f40 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Implicits.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Implicits.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/ManagedResource.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/ManagedResource.scala index dad5ecb8..dad5ecb8 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/ManagedResource.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/ManagedResource.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/ReaderInputStream.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/ReaderInputStream.scala index f9b792cc..f9b792cc 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/ReaderInputStream.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/ReaderInputStream.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Scanner.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Scanner.scala index be6ebb3f..be6ebb3f 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/Scanner.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/Scanner.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/TeeOutputStream.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/TeeOutputStream.scala index 1da25b09..1da25b09 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/TeeOutputStream.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/TeeOutputStream.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/UnicodeCharset.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/UnicodeCharset.scala index be81f628..be81f628 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/UnicodeCharset.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/UnicodeCharset.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/WriterOutputStream.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/WriterOutputStream.scala index 80cd5fc8..80cd5fc8 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/WriterOutputStream.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/WriterOutputStream.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/package.scala b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/package.scala index bef8c1ed..bef8c1ed 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/main/scala/better/files/package.scala +++ b/scalalib/src/test/resource/better-files/core/src/main/scala/better/files/package.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/CommonSpec.scala b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/CommonSpec.scala index 769cfbf9..769cfbf9 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/CommonSpec.scala +++ b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/CommonSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/FileMonitorSpec.scala b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/FileMonitorSpec.scala index 36379eec..36379eec 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/FileMonitorSpec.scala +++ b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/FileMonitorSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/FileSpec.scala b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/FileSpec.scala index f197575a..f197575a 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/FileSpec.scala +++ b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/FileSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/GlobSpec.scala b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/GlobSpec.scala index 1acf7d7b..1acf7d7b 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/GlobSpec.scala +++ b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/GlobSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/ManagedResourceSpec.scala b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/ManagedResourceSpec.scala index 554f5358..554f5358 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/ManagedResourceSpec.scala +++ b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/ManagedResourceSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/ScannerSpec.scala b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/ScannerSpec.scala index 54f0a117..54f0a117 100644 --- a/scalaplugin/src/test/resource/better-files/core/src/test/scala/better/files/ScannerSpec.scala +++ b/scalalib/src/test/resource/better-files/core/src/test/scala/better/files/ScannerSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/project/Dependencies.scala b/scalalib/src/test/resource/better-files/project/Dependencies.scala index 5e0a037d..5e0a037d 100644 --- a/scalaplugin/src/test/resource/better-files/project/Dependencies.scala +++ b/scalalib/src/test/resource/better-files/project/Dependencies.scala diff --git a/scalaplugin/src/test/resource/better-files/project/build.properties b/scalalib/src/test/resource/better-files/project/build.properties index 74e2336b..74e2336b 100644 --- a/scalaplugin/src/test/resource/better-files/project/build.properties +++ b/scalalib/src/test/resource/better-files/project/build.properties diff --git a/scalaplugin/src/test/resource/better-files/project/plugins.sbt b/scalalib/src/test/resource/better-files/project/plugins.sbt index dba2a1da..dba2a1da 100644 --- a/scalaplugin/src/test/resource/better-files/project/plugins.sbt +++ b/scalalib/src/test/resource/better-files/project/plugins.sbt diff --git a/scalaplugin/src/test/resource/better-files/shapeless/src/main/scala/better/files/ShapelessScanner.scala b/scalalib/src/test/resource/better-files/shapeless/src/main/scala/better/files/ShapelessScanner.scala index d60487d9..d60487d9 100644 --- a/scalaplugin/src/test/resource/better-files/shapeless/src/main/scala/better/files/ShapelessScanner.scala +++ b/scalalib/src/test/resource/better-files/shapeless/src/main/scala/better/files/ShapelessScanner.scala diff --git a/scalaplugin/src/test/resource/better-files/shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala b/scalalib/src/test/resource/better-files/shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala index 34557261..34557261 100644 --- a/scalaplugin/src/test/resource/better-files/shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala +++ b/scalalib/src/test/resource/better-files/shapeless/src/test/scala/better/files/ShapelessScannerSpec.scala diff --git a/scalaplugin/src/test/resource/better-files/site/index.html b/scalalib/src/test/resource/better-files/site/index.html index 29931115..29931115 100644 --- a/scalaplugin/src/test/resource/better-files/site/index.html +++ b/scalalib/src/test/resource/better-files/site/index.html diff --git a/scalaplugin/src/test/resource/better-files/site/tech_talk_preview.png b/scalalib/src/test/resource/better-files/site/tech_talk_preview.png Binary files differindex 9f9f7599..9f9f7599 100644 --- a/scalaplugin/src/test/resource/better-files/site/tech_talk_preview.png +++ b/scalalib/src/test/resource/better-files/site/tech_talk_preview.png diff --git a/scalaplugin/src/test/resource/better-files/version.sbt b/scalalib/src/test/resource/better-files/version.sbt index 0750fecd..0750fecd 100644 --- a/scalaplugin/src/test/resource/better-files/version.sbt +++ b/scalalib/src/test/resource/better-files/version.sbt diff --git a/scalaplugin/src/test/resource/hello-world/src/main/scala/Main.scala b/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala index e288a17a..e288a17a 100644 --- a/scalaplugin/src/test/resource/hello-world/src/main/scala/Main.scala +++ b/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala diff --git a/scalaplugin/src/test/resource/hello-world/src/main/scala/Result.scala b/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala index d7d29a51..d7d29a51 100644 --- a/scalaplugin/src/test/resource/hello-world/src/main/scala/Result.scala +++ b/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala diff --git a/scalaplugin/src/test/resource/jawn/.gitignore b/scalalib/src/test/resource/jawn/.gitignore index 2db3b8c0..2db3b8c0 100644 --- a/scalaplugin/src/test/resource/jawn/.gitignore +++ b/scalalib/src/test/resource/jawn/.gitignore diff --git a/scalaplugin/src/test/resource/jawn/.travis.yml b/scalalib/src/test/resource/jawn/.travis.yml index 5f9f5fe4..5f9f5fe4 100644 --- a/scalaplugin/src/test/resource/jawn/.travis.yml +++ b/scalalib/src/test/resource/jawn/.travis.yml diff --git a/scalaplugin/src/test/resource/jawn/README.md b/scalalib/src/test/resource/jawn/README.md index 6ea33b92..6ea33b92 100644 --- a/scalaplugin/src/test/resource/jawn/README.md +++ b/scalalib/src/test/resource/jawn/README.md diff --git a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JParser.scala b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JParser.scala index 704557cc..704557cc 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JParser.scala +++ b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JParser.scala diff --git a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JValue.scala b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JValue.scala index d09347bc..d09347bc 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JValue.scala +++ b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JValue.scala diff --git a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JawnFacade.scala b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JawnFacade.scala index a2d2d711..a2d2d711 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JawnFacade.scala +++ b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/JawnFacade.scala diff --git a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/Renderer.scala b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/Renderer.scala index 3b2d9103..3b2d9103 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/main/scala/jawn/ast/Renderer.scala +++ b/scalalib/src/test/resource/jawn/ast/src/main/scala/jawn/ast/Renderer.scala diff --git a/scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/ArbitraryUtil.scala b/scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/ArbitraryUtil.scala index 6fdb8fbe..6fdb8fbe 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/ArbitraryUtil.scala +++ b/scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/ArbitraryUtil.scala diff --git a/scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/AstTest.scala b/scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/AstTest.scala index 3ec7373e..3ec7373e 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/AstTest.scala +++ b/scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/AstTest.scala diff --git a/scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/ParseCheck.scala b/scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/ParseCheck.scala index a5a5aa18..a5a5aa18 100644 --- a/scalaplugin/src/test/resource/jawn/ast/src/test/scala/jawn/ParseCheck.scala +++ b/scalalib/src/test/resource/jawn/ast/src/test/scala/jawn/ParseCheck.scala diff --git a/scalaplugin/src/test/resource/jawn/benchmark/build.sbt b/scalalib/src/test/resource/jawn/benchmark/build.sbt index 7cb15b12..7cb15b12 100644 --- a/scalaplugin/src/test/resource/jawn/benchmark/build.sbt +++ b/scalalib/src/test/resource/jawn/benchmark/build.sbt diff --git a/scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/JmhBenchmarks.scala b/scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/JmhBenchmarks.scala index bc56f9f6..bc56f9f6 100644 --- a/scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/JmhBenchmarks.scala +++ b/scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/JmhBenchmarks.scala diff --git a/scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/Parboiled.scala b/scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/Parboiled.scala index bd5fed18..bd5fed18 100644 --- a/scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/Parboiled.scala +++ b/scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/Parboiled.scala diff --git a/scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/ParseLongBench.scala b/scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/ParseLongBench.scala index 97e8e6a8..97e8e6a8 100644 --- a/scalaplugin/src/test/resource/jawn/benchmark/src/main/scala/jawn/ParseLongBench.scala +++ b/scalalib/src/test/resource/jawn/benchmark/src/main/scala/jawn/ParseLongBench.scala diff --git a/scalaplugin/src/test/resource/jawn/build.sbt b/scalalib/src/test/resource/jawn/build.sbt index c32403ed..c32403ed 100644 --- a/scalaplugin/src/test/resource/jawn/build.sbt +++ b/scalalib/src/test/resource/jawn/build.sbt diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/resources/utf8.json b/scalalib/src/test/resource/jawn/parser/src/main/resources/utf8.json index 6549eaa0..6549eaa0 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/resources/utf8.json +++ b/scalalib/src/test/resource/jawn/parser/src/main/resources/utf8.json diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/AsyncParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/AsyncParser.scala index acf770d7..acf770d7 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/AsyncParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/AsyncParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBasedParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBasedParser.scala index 9fc5234a..9fc5234a 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBasedParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBasedParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBufferParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBufferParser.scala index 1902b8d2..1902b8d2 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBufferParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ByteBufferParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ChannelParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ChannelParser.scala index 3c93e741..3c93e741 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/ChannelParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/ChannelParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharBasedParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharBasedParser.scala index a054e5dc..a054e5dc 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharBasedParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharBasedParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharBuilder.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharBuilder.scala index 589437bf..589437bf 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharBuilder.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharBuilder.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharSequenceParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharSequenceParser.scala index c592326e..c592326e 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/CharSequenceParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/CharSequenceParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Facade.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Facade.scala index 203b68e9..203b68e9 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Facade.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Facade.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/MutableFacade.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/MutableFacade.scala index 8fe5716b..8fe5716b 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/MutableFacade.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/MutableFacade.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/NullFacade.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/NullFacade.scala index 39d55884..39d55884 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/NullFacade.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/NullFacade.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Parser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Parser.scala index 1177e91f..1177e91f 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Parser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SimpleFacade.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SimpleFacade.scala index dabec016..dabec016 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SimpleFacade.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SimpleFacade.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/StringParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/StringParser.scala index 91662fc0..91662fc0 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/StringParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/StringParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SupportParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SupportParser.scala index 2304a8dd..2304a8dd 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SupportParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SupportParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SyncParser.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SyncParser.scala index 988a8ca9..988a8ca9 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/SyncParser.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/SyncParser.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Syntax.scala b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Syntax.scala index 119b5783..119b5783 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/main/scala/jawn/Syntax.scala +++ b/scalalib/src/test/resource/jawn/parser/src/main/scala/jawn/Syntax.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/ChannelSpec.scala b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/ChannelSpec.scala index 6d5d33a9..6d5d33a9 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/ChannelSpec.scala +++ b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/ChannelSpec.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/CharBuilderSpec.scala b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/CharBuilderSpec.scala index b25e67fe..b25e67fe 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/CharBuilderSpec.scala +++ b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/CharBuilderSpec.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/JNumIndexCheck.scala b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/JNumIndexCheck.scala index b0b6568d..b0b6568d 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/JNumIndexCheck.scala +++ b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/JNumIndexCheck.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/SyntaxCheck.scala b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/SyntaxCheck.scala index fd00c260..fd00c260 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/SyntaxCheck.scala +++ b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/SyntaxCheck.scala diff --git a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/TestUtil.scala b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/TestUtil.scala index 64b8dd59..64b8dd59 100644 --- a/scalaplugin/src/test/resource/jawn/parser/src/test/scala/jawn/TestUtil.scala +++ b/scalalib/src/test/resource/jawn/parser/src/test/scala/jawn/TestUtil.scala diff --git a/scalaplugin/src/test/resource/jawn/project/ReleaseHelper.scala b/scalalib/src/test/resource/jawn/project/ReleaseHelper.scala index 354d6506..354d6506 100644 --- a/scalaplugin/src/test/resource/jawn/project/ReleaseHelper.scala +++ b/scalalib/src/test/resource/jawn/project/ReleaseHelper.scala diff --git a/scalaplugin/src/test/resource/jawn/project/build.properties b/scalalib/src/test/resource/jawn/project/build.properties index 64317fda..64317fda 100644 --- a/scalaplugin/src/test/resource/jawn/project/build.properties +++ b/scalalib/src/test/resource/jawn/project/build.properties diff --git a/scalaplugin/src/test/resource/jawn/project/plugins.sbt b/scalalib/src/test/resource/jawn/project/plugins.sbt index 618876a9..618876a9 100644 --- a/scalaplugin/src/test/resource/jawn/project/plugins.sbt +++ b/scalalib/src/test/resource/jawn/project/plugins.sbt diff --git a/scalaplugin/src/test/resource/jawn/randjson.py b/scalalib/src/test/resource/jawn/randjson.py index 1783eba5..1783eba5 100644 --- a/scalaplugin/src/test/resource/jawn/randjson.py +++ b/scalalib/src/test/resource/jawn/randjson.py diff --git a/scalaplugin/src/test/resource/jawn/randjson2.py b/scalalib/src/test/resource/jawn/randjson2.py index eb6b9a3a..eb6b9a3a 100644 --- a/scalaplugin/src/test/resource/jawn/randjson2.py +++ b/scalalib/src/test/resource/jawn/randjson2.py diff --git a/scalaplugin/src/test/resource/jawn/support/argonaut/src/main/scala/Parser.scala b/scalalib/src/test/resource/jawn/support/argonaut/src/main/scala/Parser.scala index 0c57e4d7..0c57e4d7 100644 --- a/scalaplugin/src/test/resource/jawn/support/argonaut/src/main/scala/Parser.scala +++ b/scalalib/src/test/resource/jawn/support/argonaut/src/main/scala/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/support/argonaut/src/test/scala/ParserSpec.scala b/scalalib/src/test/resource/jawn/support/argonaut/src/test/scala/ParserSpec.scala index bb6a8566..bb6a8566 100644 --- a/scalaplugin/src/test/resource/jawn/support/argonaut/src/test/scala/ParserSpec.scala +++ b/scalalib/src/test/resource/jawn/support/argonaut/src/test/scala/ParserSpec.scala diff --git a/scalaplugin/src/test/resource/jawn/support/json4s/src/main/scala/Parser.scala b/scalalib/src/test/resource/jawn/support/json4s/src/main/scala/Parser.scala index e552621c..e552621c 100644 --- a/scalaplugin/src/test/resource/jawn/support/json4s/src/main/scala/Parser.scala +++ b/scalalib/src/test/resource/jawn/support/json4s/src/main/scala/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/support/play/src/main/scala/Parser.scala b/scalalib/src/test/resource/jawn/support/play/src/main/scala/Parser.scala index 1bca206a..1bca206a 100644 --- a/scalaplugin/src/test/resource/jawn/support/play/src/main/scala/Parser.scala +++ b/scalalib/src/test/resource/jawn/support/play/src/main/scala/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/support/rojoma-v3/src/main/scala/Parser.scala b/scalalib/src/test/resource/jawn/support/rojoma-v3/src/main/scala/Parser.scala index c031e71f..c031e71f 100644 --- a/scalaplugin/src/test/resource/jawn/support/rojoma-v3/src/main/scala/Parser.scala +++ b/scalalib/src/test/resource/jawn/support/rojoma-v3/src/main/scala/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/support/rojoma/src/main/scala/Parser.scala b/scalalib/src/test/resource/jawn/support/rojoma/src/main/scala/Parser.scala index c0725ea3..c0725ea3 100644 --- a/scalaplugin/src/test/resource/jawn/support/rojoma/src/main/scala/Parser.scala +++ b/scalalib/src/test/resource/jawn/support/rojoma/src/main/scala/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/support/spray/src/main/scala/Parser.scala b/scalalib/src/test/resource/jawn/support/spray/src/main/scala/Parser.scala index 2e589666..2e589666 100644 --- a/scalaplugin/src/test/resource/jawn/support/spray/src/main/scala/Parser.scala +++ b/scalalib/src/test/resource/jawn/support/spray/src/main/scala/Parser.scala diff --git a/scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/InvalidLong.scala b/scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/InvalidLong.scala index adffb979..adffb979 100644 --- a/scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/InvalidLong.scala +++ b/scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/InvalidLong.scala diff --git a/scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/Slice.scala b/scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/Slice.scala index 93a8159b..93a8159b 100644 --- a/scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/Slice.scala +++ b/scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/Slice.scala diff --git a/scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/package.scala b/scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/package.scala index 08f7ae3e..08f7ae3e 100644 --- a/scalaplugin/src/test/resource/jawn/util/src/main/scala/jawn/util/package.scala +++ b/scalalib/src/test/resource/jawn/util/src/main/scala/jawn/util/package.scala diff --git a/scalaplugin/src/test/resource/jawn/util/src/test/scala/jawn/util/ParseLongCheck.scala b/scalalib/src/test/resource/jawn/util/src/test/scala/jawn/util/ParseLongCheck.scala index 69c4a0e2..69c4a0e2 100644 --- a/scalaplugin/src/test/resource/jawn/util/src/test/scala/jawn/util/ParseLongCheck.scala +++ b/scalalib/src/test/resource/jawn/util/src/test/scala/jawn/util/ParseLongCheck.scala diff --git a/scalaplugin/src/test/resource/jawn/util/src/test/scala/jawn/util/SliceCheck.scala b/scalalib/src/test/resource/jawn/util/src/test/scala/jawn/util/SliceCheck.scala index b56e105e..b56e105e 100644 --- a/scalaplugin/src/test/resource/jawn/util/src/test/scala/jawn/util/SliceCheck.scala +++ b/scalalib/src/test/resource/jawn/util/src/test/scala/jawn/util/SliceCheck.scala diff --git a/scalaplugin/src/test/resource/jawn/version.sbt b/scalalib/src/test/resource/jawn/version.sbt index 1b9f6b1b..1b9f6b1b 100644 --- a/scalaplugin/src/test/resource/jawn/version.sbt +++ b/scalalib/src/test/resource/jawn/version.sbt diff --git a/scalaplugin/src/test/resource/resolve-deps/src/main/scala/Main.scala b/scalalib/src/test/resource/resolve-deps/src/main/scala/Main.scala index 5dcbe39a..5dcbe39a 100644 --- a/scalaplugin/src/test/resource/resolve-deps/src/main/scala/Main.scala +++ b/scalalib/src/test/resource/resolve-deps/src/main/scala/Main.scala diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala b/scalalib/src/test/scala/mill/scalalib/AcyclicTests.scala index 131ee6bb..9b68ea70 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/AcyclicTests.scala @@ -1,17 +1,17 @@ -package mill.scalaplugin +package mill.scalalib import ammonite.ops.ImplicitWd._ import ammonite.ops._ import mill.define.Cross import mill.discover.Discovered -import mill.scalaplugin.publish._ +import mill.scalalib.publish._ import utest._ import mill.util.JsonFormatters._ import mill.util.TestEvaluator object AcyclicBuild{ val acyclic = for(crossVersion <- Cross("2.10.6", "2.11.8", "2.12.3", "2.12.4")) - yield new SbtScalaModule with PublishModule {outer => + yield new SbtModule with PublishModule {outer => def basePath = AcyclicTests.workspacePath def artifactName = "acyclic" def publishVersion = "0.1.7" @@ -37,7 +37,7 @@ object AcyclicBuild{ Dep.Java("org.scala-lang", "scala-compiler", scalaVersion()) ) object test extends this.Tests{ - def forkWorkingDir = pwd/'scalaplugin/'src/'test/'resource/'acyclic + def forkWorkingDir = pwd/'scalalib/'src/'test/'resource/'acyclic def ivyDeps = Seq( Dep("com.lihaoyi", "utest", "0.6.0") ) @@ -47,7 +47,7 @@ object AcyclicBuild{ } object AcyclicTests extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / 'acyclic - val srcPath = pwd / 'scalaplugin / 'src / 'test / 'resource / 'acyclic + val srcPath = pwd / 'scalalib / 'src / 'test / 'resource / 'acyclic val tests = Tests{ rm(workspacePath) mkdir(workspacePath/up) diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala b/scalalib/src/test/scala/mill/scalalib/BetterFilesTests.scala index f608f311..c3004f7b 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/BetterFilesTests.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib import ammonite.ops.ImplicitWd._ import ammonite.ops._ @@ -8,7 +8,7 @@ import mill.util.JsonFormatters._ import mill.util.TestEvaluator object BetterFilesBuild{ - trait BetterFilesModule extends SbtScalaModule{ outer => + trait BetterFilesModule extends SbtModule{ outer => def scalaVersion = "2.12.4" def scalacOptions = Seq( "-deprecation", // Emit warning and location for usages of deprecated APIs. @@ -90,7 +90,7 @@ object BetterFilesBuild{ } object BetterFilesTests extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / "better-files" - val srcPath = pwd / 'scalaplugin / 'src / 'test / 'resource / "better-files" + val srcPath = pwd / 'scalalib / 'src / 'test / 'resource / "better-files" val tests = Tests{ rm(workspacePath) mkdir(workspacePath/up) diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala index b7948167..aafd980a 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib import java.util.jar.JarFile @@ -8,20 +8,20 @@ import mill._ import mill.define.{Cross, Target} import mill.discover.Discovered import mill.eval.{Evaluator, Result} -import mill.scalaplugin.publish._ +import mill.scalalib.publish._ import mill.util.TestEvaluator import sbt.internal.inc.CompileFailed import utest._ import scala.collection.JavaConverters._ -trait HelloWorldModule extends ScalaModule { +trait HelloWorldModule extends scalalib.Module { def scalaVersion = "2.12.4" def basePath = HelloWorldTests.workspacePath } object HelloWorld extends HelloWorldModule -object CrossHelloWorld extends Module{ +object CrossHelloWorld extends mill.Module{ val cross = for(v <- Cross("2.10.6", "2.11.11", "2.12.3", "2.12.4")) yield new HelloWorldModule { @@ -65,7 +65,7 @@ object HelloWorldScalaOverride extends HelloWorldModule { } object HelloWorldTests extends TestSuite { - val srcPath = pwd / 'scalaplugin / 'src / 'test / 'resource / "hello-world" + val srcPath = pwd / 'scalalib / 'src / 'test / 'resource / "hello-world" val workspacePath = pwd / 'target / 'workspace / "hello-world" val mainObject = workspacePath / 'src / 'main / 'scala / "Main.scala" diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala b/scalalib/src/test/scala/mill/scalalib/JawnTests.scala index 81d6e71a..71e4d506 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/JawnTests.scala @@ -1,8 +1,8 @@ -package mill.scalaplugin +package mill.scalalib import ammonite.ops.ImplicitWd._ import ammonite.ops._ -import mill.Module +import mill.{Module, scalalib} import mill.define.{Cross, Task} import mill.discover.Discovered import mill.eval.Result @@ -12,15 +12,15 @@ import mill.util.TestEvaluator object JawnBuild{ val Jawn = Cross("2.10.6", "2.11.11", "2.12.3").map(new Jawn(_)) - class Jawn(crossVersion: String) extends Module{ - trait JawnModule extends SbtScalaModule{ outer => + class Jawn(crossVersion: String) extends mill.Module{ + trait JawnModule extends scalalib.SbtModule{ outer => def scalaVersion = crossVersion def scalacOptions = Seq( "-deprecation", "-optimize", "-unchecked" ) - def testProjectDeps: Seq[TestScalaModule] = Nil + def testProjectDeps: Seq[TestModule] = Nil object test extends this.Tests{ def projectDeps = super.projectDeps ++ testProjectDeps def ivyDeps = Seq( @@ -44,7 +44,7 @@ object JawnBuild{ def basePath = JawnTests.srcPath/"ast" } class Support(name: String, ivyDeps0: Dep*) extends JawnModule{ - def projectDeps = Seq[ScalaModule](Parser) + def projectDeps = Seq[Module](Parser) def basePath = JawnTests.srcPath/"support"/"argonaut" def ivyDeps = ivyDeps0 } @@ -69,7 +69,7 @@ object JawnBuild{ } object JawnTests extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / "jawn" - val srcPath = pwd / 'scalaplugin / 'src / 'test / 'resource / "jawn" + val srcPath = pwd / 'scalalib / 'src / 'test / 'resource / "jawn" val tests = Tests{ rm(workspacePath) mkdir(workspacePath/up) diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/ResolveDepsTests.scala b/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala index cd6bd40f..c5a05d02 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/ResolveDepsTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala @@ -1,4 +1,4 @@ -package mill.scalaplugin +package mill.scalalib import coursier.Cache import coursier.maven.MavenRepository diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/package.scala b/scalaplugin/src/main/scala/mill/scalaplugin/package.scala deleted file mode 100644 index 1f1c5378..00000000 --- a/scalaplugin/src/main/scala/mill/scalaplugin/package.scala +++ /dev/null @@ -1,5 +0,0 @@ -package mill - -package object scalaplugin { - -} @@ -6,13 +6,13 @@ set -eux git clean -xdf # First build & run tests using SBT -sbt core/test scalaplugin/test scalajsplugin/test bin/test:assembly +sbt core/test scalalib/test scalajslib/test bin/test:assembly # Build Mill using SBT bin/target/mill devAssembly # Second build & run tests using Mill -out/devAssembly/dest Core.test -out/devAssembly/dest ScalaPlugin.test -out/devAssembly/dest ScalaJSPlugin.test +out/devAssembly/dest core.test +out/devAssembly/dest scalalib.test +out/devAssembly/dest scalajslib.test out/devAssembly/dest devAssembly
\ No newline at end of file |
