From 9ba4cb69331386dfde9bac69dc2d5b22401face3 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 12 Dec 2018 16:56:02 -0800 Subject: collapse boilerplate folder structure within src/ folders (#505) * collapse boilerplate folder structure within src/ folders * . --- docs/example-1/foo/src/Example.scala | 6 ++++++ docs/example-1/foo/src/foo/Example.scala | 6 ------ docs/example-2/foo/src/Example.scala | 6 ++++++ docs/example-2/foo/src/foo/Example.scala | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 docs/example-1/foo/src/Example.scala delete mode 100644 docs/example-1/foo/src/foo/Example.scala create mode 100644 docs/example-2/foo/src/Example.scala delete mode 100644 docs/example-2/foo/src/foo/Example.scala (limited to 'docs') diff --git a/docs/example-1/foo/src/Example.scala b/docs/example-1/foo/src/Example.scala new file mode 100644 index 00000000..f84f91f9 --- /dev/null +++ b/docs/example-1/foo/src/Example.scala @@ -0,0 +1,6 @@ +package foo +object Example{ + def main(args: Array[String]): Unit = { + println("Hello World") + } +} \ No newline at end of file diff --git a/docs/example-1/foo/src/foo/Example.scala b/docs/example-1/foo/src/foo/Example.scala deleted file mode 100644 index f84f91f9..00000000 --- a/docs/example-1/foo/src/foo/Example.scala +++ /dev/null @@ -1,6 +0,0 @@ -package foo -object Example{ - def main(args: Array[String]): Unit = { - println("Hello World") - } -} \ No newline at end of file diff --git a/docs/example-2/foo/src/Example.scala b/docs/example-2/foo/src/Example.scala new file mode 100644 index 00000000..f84f91f9 --- /dev/null +++ b/docs/example-2/foo/src/Example.scala @@ -0,0 +1,6 @@ +package foo +object Example{ + def main(args: Array[String]): Unit = { + println("Hello World") + } +} \ No newline at end of file diff --git a/docs/example-2/foo/src/foo/Example.scala b/docs/example-2/foo/src/foo/Example.scala deleted file mode 100644 index f84f91f9..00000000 --- a/docs/example-2/foo/src/foo/Example.scala +++ /dev/null @@ -1,6 +0,0 @@ -package foo -object Example{ - def main(args: Array[String]): Unit = { - println("Hello World") - } -} \ No newline at end of file -- cgit v1.2.3 From 293528734bb901d9d240782cde9e5f86221713a2 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 14 Dec 2018 23:18:47 +0100 Subject: Fixed plugin usage docs for mill-osgi --- docs/pages/9 - Contrib Modules.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/pages/9 - Contrib Modules.md b/docs/pages/9 - Contrib Modules.md index 4d811cde..cf63039a 100644 --- a/docs/pages/9 - Contrib Modules.md +++ b/docs/pages/9 - Contrib Modules.md @@ -276,18 +276,21 @@ Project home: https://github.com/lefou/mill-osgi #### Quickstart ```scala -import $ivy.`de.tototec::de.tobiasroeser.mill.osgi:0.0.2` +import mill._, mill.scalalib._ +import $ivy.`de.tototec::de.tobiasroeser.mill.osgi:0.0.5` import de.tobiasroeser.mill.osgi._ object project extends ScalaModule with OsgiBundleModule { def bundleSymbolicName = "com.example.project" - def osgiHeaders = T{ osgiHeaders().copy( + def osgiHeaders = T{ super.osgiHeaders().copy( `Export-Package` = Seq("com.example.api"), `Bundle-Activator` = Some("com.example.internal.Activator") )} + // other settings ... + } ``` -- cgit v1.2.3