From 6ec3d3f210257308558a85df1886467cdc9e1e95 Mon Sep 17 00:00:00 2001 From: eldurloki Date: Thu, 2 Jan 2014 19:09:52 +0100 Subject: [PATCH 1/2] Update to sbt 0.13.1 - comments reduced - unused sbt plugins removed + assemby plugin updated --- build.sbt | 5 ----- project/assemby.sbt | 1 + project/build.properties | 1 + project/plugins/build.sbt | 11 ----------- 4 files changed, 2 insertions(+), 16 deletions(-) create mode 100644 project/assemby.sbt create mode 100644 project/build.properties delete mode 100644 project/plugins/build.sbt diff --git a/build.sbt b/build.sbt index ae1cbde..d3219b9 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,6 @@ libraryDependencies ++= Seq( "com.asual.lesscss" % "lesscss-engine" % "1.1.5", "org.yaml" % "snakeyaml" % "1.10", "org.jsoup" % "jsoup" % "1.6.3" -// "org.imgscalr" % "imgscalr-lib" % "4.2" ) resolvers ++= Seq( @@ -37,10 +36,6 @@ mainClass in (Compile, run) := Some("nl.flotsam.monkeyman.Monkeyman") mainClass in (Compile, packageBin) := Some("nl.flotsam.monkeyman.Monkeyman") -//seq(ProguardPlugin.proguardSettings :_*) -// -//proguardOptions ++= List(keepMain("nl.flotsam.monkeyman.Monkeyman"), "-keepclasseswithmembers class org.pegdown.**", "-keepclasseswithmembers class org.parboiled.**") - seq(assemblySettings: _*) mainClass in assembly := Some("nl.flotsam.monkeyman.Monkeyman") diff --git a/project/assemby.sbt b/project/assemby.sbt new file mode 100644 index 0000000..9ed6e81 --- /dev/null +++ b/project/assemby.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.1") diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..ee2bdf1 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version = 0.13.1 diff --git a/project/plugins/build.sbt b/project/plugins/build.sbt deleted file mode 100644 index 8a60821..0000000 --- a/project/plugins/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -//libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-proguard-plugin" % (v+"-0.1.1")) - -resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/" - -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0-SNAPSHOT") - -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.4") - -resolvers += Resolver.url("sbt-plugin-releases", - new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns) - From f5e20c2ee000f87d6f9fc0fbf2b92618d24a9ec0 Mon Sep 17 00:00:00 2001 From: eldurloki Date: Fri, 3 Jan 2014 07:07:50 +0100 Subject: [PATCH 2/2] Move sample index according to release notes Issue: #3 --- sample/source/{index.scaml => index.html.scaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sample/source/{index.scaml => index.html.scaml} (100%) diff --git a/sample/source/index.scaml b/sample/source/index.html.scaml similarity index 100% rename from sample/source/index.scaml rename to sample/source/index.html.scaml