From f098a1ef8fa112bea44a5bcb1d941a44fecfaf69 Mon Sep 17 00:00:00 2001 From: Daniel Spangenberger Date: Fri, 13 Jun 2014 13:41:37 -0400 Subject: [PATCH 1/5] switch to build.sbt, add ghpages plugin, switch to scala 2.11.1. --- framework-src/build.sbt | 31 ++++++++++++++++++++++++++ framework-src/project/Build.scala | 29 ------------------------ framework-src/project/build.properties | 2 +- framework-src/project/plugins.sbt | 10 ++++++--- 4 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 framework-src/build.sbt delete mode 100644 framework-src/project/Build.scala diff --git a/framework-src/build.sbt b/framework-src/build.sbt new file mode 100644 index 0000000..7b70710 --- /dev/null +++ b/framework-src/build.sbt @@ -0,0 +1,31 @@ +name := "factory_pal" + +organization := "ar.com.gonto" + +version := "0.2.2" + +scalaVersion := "2.11.1" + +scalacOptions := Seq("-deprecation", "-feature") + +licenses := ("Apache2", new java.net.URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil + +libraryDependencies ++= Seq( + "org.scalatest" %% "scalatest" % "2.2.0" % "test", + "org.scala-lang" % "scala-compiler" % "2.11.1" +) + +resolvers ++= Seq( + "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/", + "OSS SonarType" at "https://oss.sonatype.org/content/groups/public/" +) + +site.settings + +ghpages.settings + +git.remoteRepo := "git@github.com:salsify/salsify.github.io.git" + +git.gitCurrentBranch := "master" + +git.branch := Some("master") diff --git a/framework-src/project/Build.scala b/framework-src/project/Build.scala deleted file mode 100644 index 8d18f67..0000000 --- a/framework-src/project/Build.scala +++ /dev/null @@ -1,29 +0,0 @@ -import sbt._ -import sbt.Keys._ - -object ApplicationBuild extends Build { - - - lazy val root = Project( - id = "factory_pal", - base = file("."), - settings = Project.defaultSettings ++ Seq( - name := "factory_pal", - organization := "ar.com.gonto", - version := "0.2.1", - scalaVersion := "2.10.0", - scalacOptions := Seq("-deprecation", "-feature"), - licenses := ("Apache2", new java.net.URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil, - libraryDependencies ++= Seq( - "org.scalatest" % "scalatest_2.10" % "1.9.1" % "test", - "org.scala-lang" % "scala-compiler" % "2.10.0" - ), - resolvers ++= Seq( - "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/", - "OSS SonarType" at "https://oss.sonatype.org/content/groups/public/" - ) - - // add other settings here - ) - ) -} diff --git a/framework-src/project/build.properties b/framework-src/project/build.properties index 4474a03..be6c454 100644 --- a/framework-src/project/build.properties +++ b/framework-src/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.1 +sbt.version=0.13.5 diff --git a/framework-src/project/plugins.sbt b/framework-src/project/plugins.sbt index 3c6a69a..8febba7 100644 --- a/framework-src/project/plugins.sbt +++ b/framework-src/project/plugins.sbt @@ -2,8 +2,12 @@ logLevel := Level.Warn // The Typesafe repository -resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" +resolvers ++= Seq( + "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/", + "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/", + "jgit-repo" at "http://download.eclipse.org/jgit/maven" +) -resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/" +addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2") -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0-SNAPSHOT") +addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") From 45c90b153f566d45f9942ed030b1c63fa9e24963 Mon Sep 17 00:00:00 2001 From: Daniel Spangenberger Date: Fri, 13 Jun 2014 14:24:18 -0400 Subject: [PATCH 2/5] publish 0.2.2 --- framework-src/build.sbt | 16 +++++++--------- framework-src/project/plugins.sbt | 5 +---- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/framework-src/build.sbt b/framework-src/build.sbt index 7b70710..1beff2c 100644 --- a/framework-src/build.sbt +++ b/framework-src/build.sbt @@ -20,12 +20,10 @@ resolvers ++= Seq( "OSS SonarType" at "https://oss.sonatype.org/content/groups/public/" ) -site.settings - -ghpages.settings - -git.remoteRepo := "git@github.com:salsify/salsify.github.io.git" - -git.gitCurrentBranch := "master" - -git.branch := Some("master") +publishTo := { + val rootPath = "../../factory_pal_ghpages" + if (version.value.trim.endsWith("SNAPSHOT")) + Some(Resolver.file("snapshots", new File(rootPath) ) ) + else + Some(Resolver.file("releases", new File(rootPath)) ) +} diff --git a/framework-src/project/plugins.sbt b/framework-src/project/plugins.sbt index 8febba7..21051ba 100644 --- a/framework-src/project/plugins.sbt +++ b/framework-src/project/plugins.sbt @@ -4,10 +4,7 @@ logLevel := Level.Warn // The Typesafe repository resolvers ++= Seq( "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/", - "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/", - "jgit-repo" at "http://download.eclipse.org/jgit/maven" + "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/" ) -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2") - addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") From 3df15eecc78bad9a3205539e22f5b536cf087a4c Mon Sep 17 00:00:00 2001 From: Daniel Spangenberger Date: Fri, 13 Jun 2014 14:24:45 -0400 Subject: [PATCH 3/5] switch to building 0.2.3-SNAPSHOT --- framework-src/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-src/build.sbt b/framework-src/build.sbt index 1beff2c..1acd974 100644 --- a/framework-src/build.sbt +++ b/framework-src/build.sbt @@ -2,7 +2,7 @@ name := "factory_pal" organization := "ar.com.gonto" -version := "0.2.2" +version := "0.2.3-SNAPSHOT" scalaVersion := "2.11.1" From 1cf36f5097f44115ab94ecda099f806880fa412f Mon Sep 17 00:00:00 2001 From: Dan Spangenberger Date: Fri, 13 Jun 2014 14:45:49 -0400 Subject: [PATCH 4/5] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9a2eec7..f7c4006 100644 --- a/README.md +++ b/README.md @@ -76,18 +76,18 @@ object ApplicationBuild extends Build { name := "factory_pal_sample", organization := "ar.com.gonto", version := "0.2", - scalaVersion := "2.10.0", + scalaVersion := "2.11.1", scalacOptions += "", licenses := ("Apache2", new java.net.URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil, libraryDependencies ++= Seq( "org.scala-lang" % "scala-compiler" % "2.10.0", - "ar.com.gonto" % "factory_pal_2.10" % "0.2.1", + "ar.com.gonto" %% "factory_pal" % "0.2.2", "org.scalatest" % "scalatest_2.10" % "1.9.1" % "test" ), resolvers ++= Seq( "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/", Resolver.url("Factory Pal Repository", - url("http://mgonto.github.com/releases/"))(Resolver.ivyStylePatterns) + url("https://salsify.github.io/factory_pal/"))(Resolver.ivyStylePatterns) ) ) ) From f6adaaee75e77957900f58375b91f741f871ff31 Mon Sep 17 00:00:00 2001 From: Sven Koschnicke Date: Mon, 7 Mar 2016 13:44:22 +0100 Subject: [PATCH 5/5] removed plugin dependency --- framework-src/project/plugins.sbt | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework-src/project/plugins.sbt b/framework-src/project/plugins.sbt index 3c6a69a..c5042f2 100644 --- a/framework-src/project/plugins.sbt +++ b/framework-src/project/plugins.sbt @@ -5,5 +5,3 @@ logLevel := Level.Warn resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/" - -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0-SNAPSHOT")