From 52f2b833719399d139edd0c7dc0f381476437b78 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 12 Jan 2016 13:20:02 -0500 Subject: [PATCH 1/4] bump copyright year to 2016 --- LICENSE.md | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 896e799..96aae5b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2015, Typesafe Inc. +Copyright (c) 2015-2016, Typesafe Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/build.sbt b/build.sbt index 3a33ef1..ac2627b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -// Copyright (C) 2015 Typesafe Inc. +// Copyright (C) 2015-2016 Typesafe Inc. organization := "com.typesafe" name := "scala-sculpt" From 06a2819503ea9f9b1fcfd1be5f6d3cbeaba3feed Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 12 Jan 2016 13:21:23 -0500 Subject: [PATCH 2/4] fix fat jar to not include all of Scala standard library --- build.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sbt b/build.sbt index ac2627b..aad265c 100644 --- a/build.sbt +++ b/build.sbt @@ -30,6 +30,9 @@ scalacOptions ++= Seq( assemblyJarName in assembly := s"${name.value}_${scalaBinaryVersion.value}-${version.value}.jar" +assemblyOption in assembly := + (assemblyOption in assembly).value.copy(includeScala = false) + mappings in (Compile, packageBin) ++= Seq( (baseDirectory.value / "README.md") -> "README.md", (baseDirectory.value / "LICENSE.md") -> "LICENSE.md") From 0c2e37270b84f4140a72e93d2f4680ad3ce63576 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 12 Jan 2016 13:29:13 -0500 Subject: [PATCH 3/4] fix fat jar to include readme and license this different way of adding them affects both `package` and `assembly` tasks. yay! --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index aad265c..57a8259 100644 --- a/build.sbt +++ b/build.sbt @@ -33,9 +33,9 @@ assemblyJarName in assembly := assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false) -mappings in (Compile, packageBin) ++= Seq( - (baseDirectory.value / "README.md") -> "README.md", - (baseDirectory.value / "LICENSE.md") -> "LICENSE.md") +unmanagedResources in Compile ++= + Seq("README.md", "LICENSE.md") + .map(baseDirectory.value / _) pomExtra := ( https://github.com/typesafehub/scala-sculpt.git From c0429ae275cbac901ad64a20419238a0786bffa6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 12 Jan 2016 13:21:15 -0500 Subject: [PATCH 4/4] bump version to 0.1.2 --- README.md | 8 ++++---- build.sbt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index eaed3b3..d68fc36 100644 --- a/README.md +++ b/README.md @@ -15,18 +15,18 @@ incremental recompile times. ## Building the plugin from source -`sbt assembly` will create `target/scala-2.11/scala-sculpt_2.11-0.1.1.jar`. +`sbt assembly` will create `target/scala-2.11/scala-sculpt_2.11-0.1.2.jar`. (The JAR is a fat JAR that bundles its dependency on spray-json.) ## Using the plugin You can use the compiled plugin with the Scala 2.11 compiler as follows. -Supposing you have `scala-sculpt_2.11-0.1.1.jar` in your current working directory, +Supposing you have `scala-sculpt_2.11-0.1.2.jar` in your current working directory, Then you can do e.g.: - scalac -Xplugin:scala-sculpt_2.11-0.1.1.jar \ + scalac -Xplugin:scala-sculpt_2.11-0.1.2.jar \ -Xplugin-require:sculpt \ -P:sculpt:out=dep.json \ Dep.scala @@ -123,7 +123,7 @@ manipulation, e.g. in the REPL. Now in a Scala 2.11 REPL with the same JARs on the classpath: - scala -classpath scala-sculpt_2.11-0.1.1.jar + scala -classpath scala-sculpt_2.11-0.1.2.jar If we load `dep.json` as follows, we'll see the following graph: diff --git a/build.sbt b/build.sbt index 57a8259..8c5086d 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "com.typesafe" name := "scala-sculpt" -version := "0.1.1" +version := "0.1.2" licenses := Seq("Apache License v2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) homepage := Some(url("http://github.com/typesafehub/scala-sculpt"))