Merge remote-tracking branch 'origin/develop'

README.md

@@ -1,7 +1,7 @@
 sbt-install4j
 =============
 
-SBT plugin for building installers with Install4J.
+[SBT] plugin for building installers with [Install4J].
 
 Usage
 -----
@@ -13,18 +13,14 @@ Usage
 Import `sbt-install4j` plugin to use `install4j` command.
 
 ```scala
-addSbtPlugin("com.github.jpsacha" % "sbt-install4j" % "1.0.0")
+addSbtPlugin("com.github.jpsacha" % "sbt-install4j" % "1.1.0")
 ```
 
 ### build.sbt
 Sample use, add following to your `build.sbt`:
 
 ```scala
-import Install4JKeys._
-
-install4jSettings
-
-// Location of the Install4J project file
+enablePlugins(SBTInstall4J)
 install4jProjectFile := "installer/example.install4j"
 ```
 
@@ -67,3 +63,5 @@ SBT settings provided by  `sbt-install4j` plugin:
   In the map, the `key` is variable's name, the `value` is variable's value.
 
 
+[Install4J]: https://www.ej-technologies.com/products/install4j/overview.html
+[SBT]: http://www.scala-sbt.org/

build.sbt

@@ -1,34 +1,23 @@
-import SonatypeKeys._
+// @formatter:off
 
-// Import default Sonatype publish settings.
-sonatypeSettings
-
-scalaVersion := "2.10.4"
-
-sbtPlugin := true
-
-name := "sbt-install4j"
-
-organization := "com.github.jpsacha"
-
-version := "1.0.0"
-
-description := "SBT plugin for building installers with Install4J."
-
-homepage := Some(url("http://github.com/jpsacha/sbt-install4j"))
+name                 := "sbt-install4j"
+organization         := "com.github.jpsacha"
+version              := "1.1.0"
 
+homepage             := Some(url("http://github.com/jpsacha/sbt-install4j"))
 organizationHomepage := Some(url("http://ij-plugins.sf.net"))
+startYear            := Some(2014)
+licenses             := Seq("GPLv3" -> url("http://www.gnu.org/licenses/gpl.html"))
+description          := "SBT plugin for building installers with Install4J."
 
-startYear := Some(2014)
+scalaVersion := "2.10.6"
 
-licenses := Seq("GPLv3" -> url("http://www.gnu.org/licenses/gpl.html"))
+sbtPlugin := true
 
 scalacOptions := Seq("-deprecation", "-unchecked")
 
 publishArtifact in(Test, packageBin) := false
-
 publishArtifact in(Test, packageDoc) := false
-
 publishArtifact in(Test, packageSrc) := false
 
 //publishMavenStyle := false

example/build-install4j.sbt

@@ -1,12 +1,8 @@
 //
 // sbt-install4j plugin settings
 //
-import Install4JKeys._
-
-install4jSettings
 
+enablePlugins(SBTInstall4J)
 install4jProjectFile := "installer/example.install4j"
-
 install4jVerbose := true
-
 install4jRelease := version.value

example/build.sbt

@@ -1,10 +1,8 @@
 name := "sbt-install4j-example"
-
 organization := "ij-plugins.sf.net"
+version := "0.1.0"
 
-version := "0.0.2"
-
-scalaVersion := "2.11.2"
+scalaVersion := "2.11.8"
 
 // Set the prompt (for this build) to include the project id.
 shellPrompt in ThisBuild := { state => "sbt:"+Project.extract(state).currentRef.project + "> " }

example/project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=0.13.5
+sbt.version=0.13.11
 

example/project/plugin-install4j.sbt

@@ -1,3 +1,2 @@
-resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
-
-addSbtPlugin("com.github.jpsacha" % "sbt-install4j" % "1.0.0")
+// [[https://github.com/jpsacha/sbt-install4j]]
+addSbtPlugin("com.github.jpsacha" % "sbt-install4j" % "1.1.0-SNAPSHOT")

notes/1.1.0.markdown

@@ -0,0 +1,2 @@
+* Moved to `autoPlugin` setup.
+* Using Install4J v.6 as default installer compiler.

project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=0.13.5
+sbt.version=0.13.11
 

project/sbt-sonatype.sbt

@@ -1,2 +1,3 @@
 // [https://github.com/xerial/sbt-sonatype]
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

src/main/scala/net/ij_plugins/sf/sbt/install4j/Plugin.scala → src/main/scala/net/ij_plugins/sf/sbt/install4j/SBTInstall4J.scala

@@ -16,16 +16,15 @@
 
 package net.ij_plugins.sf.sbt.install4j
 
-import sbt._
+import java.io.{File, IOException}
+
 import sbt.Keys._
-import java.io.{IOException, File}
+import sbt._
 
 /** SBT plugin for building installers with Install4J. */
-object Plugin extends sbt.Plugin {
+object SBTInstall4J extends sbt.AutoPlugin {
 
-  import Install4JKeys._
-
-  object Install4JKeys {
+  object autoImport {
     lazy val install4j = TaskKey[Unit]("install4j",
       "Builds Install4J project.")
 
@@ -59,7 +58,9 @@ object Plugin extends sbt.Plugin {
         "In the map, the `key` is variable's name, the `value` is variable's value.")
   }
 
-  lazy val install4jSettings: Seq[Def.Setting[_]] = Seq(
+  import net.ij_plugins.sf.sbt.install4j.SBTInstall4J.autoImport._
+
+  override def projectSettings: Seq[Def.Setting[_]] = Seq(
     install4j := {
       // Run dependent tasks first
       val _v1 = (packageBin in Compile).value
@@ -96,7 +97,7 @@ object Plugin extends sbt.Plugin {
 
     install4jCopyDependedJarsEnabled := true,
 
-    install4jHomeDir := file("C:/Program Files/install4j5"),
+    install4jHomeDir := file("C:/Program Files/install4j6"),
 
     install4jProjectFile := "installer/installer.install4j",