Skip to content

Commit e650c82

Browse files
committed
Merge pull request #15 from SethTisue/include-readme-in-jar
version 0.1.0, with readme in jar
2 parents 69fab15 + ffcddb0 commit e650c82

File tree

16 files changed

+64
-5
lines changed

16 files changed

+64
-5
lines changed

LICENSE.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright (c) 2015, Typesafe Inc.
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
* Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
* Neither the name of the Scala project nor the names of its contributors
15+
may be used to endorse or promote products derived from this
16+
software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ incremental recompile times.
1616

1717
## Building the plugin from source
1818

19-
`sbt package` will create `target/scala-2.11/scala-sculpt_2.11-0.0.1.jar`.
19+
`sbt package` will create `target/scala-2.11/scala-sculpt_2.11-0.1.0.jar`.
2020

2121
## Using the plugin
2222

2323
You can use the compiled plugin with the Scala 2.11 compiler as follows.
2424

25-
First, make sure you have `scala-sculpt_2.11-0.0.1.jar` in your current working directory,
25+
Supposing you have `scala-sculpt_2.11-0.1.0.jar` in your current working directory,
2626
along with `spray-json_2.11-1.3.2.jar` (which you can download
2727
[here](http://repo1.maven.org/maven2/io/spray/spray-json_2.11/1.3.2/spray-json_2.11-1.3.2.jar).
2828

2929
Then you can do e.g.:
3030

31-
scalac -Xplugin:scala-sculpt_2.11-0.0.1.jar:spray-json_2.11-1.3.2.jar \
31+
scalac -Xplugin:scala-sculpt_2.11-0.1.0.jar:spray-json_2.11-1.3.2.jar \
3232
-Xplugin-require:sculpt \
3333
-P:sculpt:out=dep.json \
3434
Dep.scala
@@ -125,7 +125,7 @@ manipulation, e.g. in the REPL.
125125

126126
Now in a Scala 2.11 REPL with the same JARs on the classpath:
127127

128-
scala -classpath scala-sculpt_2.11-0.0.1.jar:spray-json_2.11-1.3.2.jar
128+
scala -classpath scala-sculpt_2.11-0.1.0.jar:spray-json_2.11-1.3.2.jar
129129

130130
If we load `dep.json` as follows, we'll see the following graph:
131131

build.sbt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
organization := "com.typesafe"
24
name := "scala-sculpt"
3-
version := "0.0.1"
5+
version := "0.1.0"
46
licenses := Seq("Apache License v2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))
57
homepage := Some(url("http://github.com/typesafehub/scala-sculpt"))
68

@@ -22,6 +24,10 @@ scalacOptions ++= Seq(
2224
"-Xfatal-warnings"
2325
)
2426

27+
mappings in (Compile, packageBin) ++= Seq(
28+
(baseDirectory.value / "README.md") -> "README.md",
29+
(baseDirectory.value / "LICENSE.md") -> "LICENSE.md")
30+
2531
pomExtra := (<scm>
2632
<url>https://github.com/typesafehub/scala-sculpt.git</url>
2733
<connection>scm:https://github.com/typesafehub/scala-sculpt.git</connection></scm>)

src/main/scala/scala/tools/sculpt/cmd/package.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt
24

35
import spray.json._

src/main/scala/scala/tools/sculpt/model/FullDependenciesPrinter.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt.model
24

35
import spray.json._

src/main/scala/scala/tools/sculpt/model/ModelJsonProtocol.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt.model
24

35
import spray.json._

src/main/scala/scala/tools/sculpt/model/TreePrinter.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt.model
24

35
object TreePrinter {

src/main/scala/scala/tools/sculpt/model/model.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt.model
24

35
import scala.StringBuilder

src/main/scala/scala/tools/sculpt/plugin/ExtractDependencies.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt.plugin
24

35
import scala.collection.mutable

src/main/scala/scala/tools/sculpt/plugin/SculptPlugin.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
2+
13
package scala.tools.sculpt.plugin
24

35
import java.io.File

0 commit comments

Comments
 (0)