Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
)
)
Expand Down
29 changes: 29 additions & 0 deletions framework-src/build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name := "factory_pal"

organization := "ar.com.gonto"

version := "0.2.3-SNAPSHOT"

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/"
)

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)) )
}
29 changes: 0 additions & 29 deletions framework-src/project/Build.scala

This file was deleted.

2 changes: 1 addition & 1 deletion framework-src/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.12.1
sbt.version=0.13.5
9 changes: 4 additions & 5 deletions framework-src/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
logLevel := Level.Warn

// The Typesafe repository
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")
resolvers ++= Seq(
"Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/",
"Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/"
)