From e740276583247ffbc92d2d6e110ad4e4e7296fc8 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Thu, 14 Dec 2017 12:29:48 +0100 Subject: [PATCH] Releases 0.7.13. Cleans some unused imports (#249) --- project/KazariBuild.scala | 19 +++++++------------ .../util/MicrositeHelperSpecific.scala | 9 --------- .../util/MicrositeHelperSpecific.scala | 9 --------- src/main/scala/microsites/microsites.scala | 2 -- .../microsites/util/MicrositeHelper.scala | 5 ++--- version.sbt | 2 +- 6 files changed, 10 insertions(+), 36 deletions(-) diff --git a/project/KazariBuild.scala b/project/KazariBuild.scala index b0c0077f..133d22a7 100644 --- a/project/KazariBuild.scala +++ b/project/KazariBuild.scala @@ -13,20 +13,15 @@ object KazariBuild { } } - lazy val kazariDefaultPath = SettingKey[String]( - "kazariDefaultPath", - "Default path where the scripts generated by Scala.JS live") - lazy val kazariPluginFilename = SettingKey[String]( - "kazariPluginFilename", - "Filename of the resulting generated javascript plugin") - lazy val fastOptSuffix = SettingKey[String]( - "fastOptSuffix", + lazy val kazariDefaultPath = + settingKey[String]("Default path where the scripts generated by Scala.JS live") + lazy val kazariPluginFilename = + settingKey[String]("Filename of the resulting generated javascript plugin") + lazy val fastOptSuffix = settingKey[String]( "Suffix used by Scala.JS to name the main script generated as a result of a fastOptJS task") - lazy val fullOptSuffix = SettingKey[String]( - "fullOptSuffix", + lazy val fullOptSuffix = settingKey[String]( "Suffix used by Scala.JS to name the main script generated as a result of a fullOptJS task") - lazy val jsDepSuffix = SettingKey[String]( - "jsDepSuffix", + lazy val jsDepSuffix = settingKey[String]( "Suffix used by Scala.JS to name the dependencies script generated as a result of a fastOptJS/fullOptJS task") lazy val jsFastOptAssembleTask = TaskKey[Unit]( diff --git a/src/main/scala-2.10/microsites/util/MicrositeHelperSpecific.scala b/src/main/scala-2.10/microsites/util/MicrositeHelperSpecific.scala index 79d92610..dc509741 100644 --- a/src/main/scala-2.10/microsites/util/MicrositeHelperSpecific.scala +++ b/src/main/scala-2.10/microsites/util/MicrositeHelperSpecific.scala @@ -18,16 +18,7 @@ package microsites.util import java.io.File -import com.sksamuel.scrimage._ -import sbtorgpolicies.model.YamlFormats._ -import microsites._ -import microsites.layouts._ -import net.jcazevedo.moultingyaml.{YamlObject, _} import sbt._ -import sbtorgpolicies.io._ -import sbtorgpolicies.io.syntax._ - -import scala.io.Source trait MicrositeHelperSpecific { /* diff --git a/src/main/scala-2.12/microsites/util/MicrositeHelperSpecific.scala b/src/main/scala-2.12/microsites/util/MicrositeHelperSpecific.scala index 790d86be..43a8fef7 100644 --- a/src/main/scala-2.12/microsites/util/MicrositeHelperSpecific.scala +++ b/src/main/scala-2.12/microsites/util/MicrositeHelperSpecific.scala @@ -18,17 +18,8 @@ package microsites.util import java.io.File -import com.sksamuel.scrimage._ -import sbtorgpolicies.model.YamlFormats._ -import microsites._ -import microsites.layouts._ -import net.jcazevedo.moultingyaml.{YamlObject, _} import sbt.io._ import sbt.io.syntax._ -import sbtorgpolicies.io._ -import sbtorgpolicies.io.syntax._ - -import scala.io.Source trait MicrositeHelperSpecific { /* diff --git a/src/main/scala/microsites/microsites.scala b/src/main/scala/microsites/microsites.scala index 94fe6ebe..9ca31e52 100644 --- a/src/main/scala/microsites/microsites.scala +++ b/src/main/scala/microsites/microsites.scala @@ -18,8 +18,6 @@ package microsites import sbt._ -import scala.language.{postfixOps, reflectiveCalls} - case class KazariDependency( groupId: String, artifactId: String, diff --git a/src/main/scala/microsites/util/MicrositeHelper.scala b/src/main/scala/microsites/util/MicrositeHelper.scala index d4acbac6..330da097 100644 --- a/src/main/scala/microsites/util/MicrositeHelper.scala +++ b/src/main/scala/microsites/util/MicrositeHelper.scala @@ -53,9 +53,8 @@ class MicrositeHelper(config: MicrositeSettings) extends MicrositeHelperSpecific def createResources(resourceManagedDir: File, tutSourceDirectory: File): List[File] = { - val targetDir: String = resourceManagedDir.getAbsolutePath.ensureFinalSlash - val tutSourceDir: String = tutSourceDirectory.getAbsolutePath.ensureFinalSlash - val pluginURL: URL = getClass.getProtectionDomain.getCodeSource.getLocation + val targetDir: String = resourceManagedDir.getAbsolutePath.ensureFinalSlash + val pluginURL: URL = getClass.getProtectionDomain.getCodeSource.getLocation copyJARResourcesTo(pluginURL, s"$targetDir$jekyllDir/", "_sass") copyJARResourcesTo(pluginURL, s"$targetDir$jekyllDir/", "css") diff --git a/version.sbt b/version.sbt index 050467ff..93283819 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.7.13-SNAPSHOT" \ No newline at end of file +version in ThisBuild := "0.7.13" \ No newline at end of file