enabling cross-building on sbt file

Author: celadari

README.md

@@ -16,9 +16,10 @@ scala.
 ### Scala Versions
 
 This project is compiled, tested, and published for the following Scala versions:
-1. 2.10.3
-2. 2.11.12
-3. 2.12.6
+* 2.10.7
+* 2.11.12
+* 2.12.6
+* 2.13.1
 
 ## 1. Installation
 

build.sbt

@@ -1,48 +1,44 @@
-name := "Json Logic Scala"
+name := "json-logic-scala"
 
 organization := "com.github.celadari"
 
 homepage := Some(url("https://github.com/celadari/json-logic-scala"))
 
-version := "0.0.1-SNAPSHOT"
+version := "1.0.0"
 
-scalaVersion := "2.11.12"
+scalaVersion := "2.10.7"
 
-crossScalaVersions := Seq("2.10.3", "2.11.12", "2.12.6")
+crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.1")
 
 resolvers ++= Seq(
-  "sonatype-snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
-  "sonatype-releases"  at "http://oss.sonatype.org/content/repositories/releases"
+  "sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
+  "sonatype-releases"  at "https://oss.sonatype.org/content/repositories/releases"
 )
 
+val typeSafeVersions = Map("2.10" -> "2.6.14", "2.11" -> "2.7.4", "2.12" -> "2.8.1", "2.13" -> "2.8.1")
+def resolveVersion(scalaV: String, versionsResolver: Map[String, String]): String = versionsResolver(scalaV.slice(0, 4))
+
 libraryDependencies ++= {
   Seq(
     "org.scala-lang" % "scala-compiler" % scalaVersion.value,
-    "com.typesafe.play" %% "play-json" % "2.7.2"
-//    "org.scalatest"  %% "scalatest"   % "1.9.1"  % "test",
-//    "org.scalacheck" %% "scalacheck"  % "1.10.1" % "test"
+    "com.typesafe.play" %% "play-json" % resolveVersion(scalaVersion.value, typeSafeVersions)
   )
 }
 
-scalacOptions <<= scalaVersion map { v: String =>
-  val opts = "-deprecation" :: "-unchecked" :: Nil
-  if (v.startsWith("2.9.")) opts 
-  else opts ++ ("-feature" :: "-language:postfixOps" :: "-language:implicitConversions" :: Nil)
-}
+scalacOptions ++= ("-feature" :: "-language:postfixOps" :: "-language:implicitConversions" :: Nil)
 
 // Publishing stuff for sonatype
-publishTo <<= version { _.endsWith("SNAPSHOT") match {
-    case true  => Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
-    case false => Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
-  }
+publishTo := {
+  if (version.value.endsWith("SNAPSHOT")) Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
+  else Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
 }
 
-credentials += Credentials( file("sonatype.credentials") )
-
-publishMavenStyle := true
+credentials += Credentials(Path.userHome / ".sbt" / ".credentials")
 
 publishArtifact in Test := false
 
+publishMavenStyle := true
+
 pomIncludeRepository := { _ => false }
 
 pomExtra := (
@@ -61,36 +57,7 @@ pomExtra := (
 
 licenses += ("MIT", url("http://mit-license.org/"))
 
-// OSGi Bundle stuff
-osgiSettings
-
-OsgiKeys.bundleSymbolicName := "com.github.celadari.jsonlogicscala"
-
-OsgiKeys.exportPackage := Seq("com.github.celadari.jsonlogicscala",
-                              "com.github.celadari.jsonlogicscala.core",
-                              "com.github.celadari.jsonlogicscala.operators"
-                              )
-
-OsgiKeys.privatePackage := Seq()
-
-OsgiKeys.bundleActivator := None
-
-// Scala bundle versions require special handling becuase of binary compatibility issues.
-// This is a bit tricky because the published jars are versioned with more than just the Scala version.
-// For example, 2.10.1 is versioned as 2.10.1.v20130302-092018-VFINAL-33e32179fd
-OsgiKeys.requireBundle <<= (scalaVersion, crossScalaVersions) { (ver, crossVers) => 
-  val nextVer = crossVers.zip(crossVers.tail).find(_._1 == ver).map(_._2)
-  val langBundleVer = 
-    if(ver.startsWith("2.10")) "[2.10,2.11)"          // All 2.10.x versions are binary-compatible
-    else "["+ver+","+nextVer.get+")"                  // The current version, up to but excluding the next version
-  Seq("scala-library;bundle-version=\""+langBundleVer+"\"") 
-}
-
 // Scaladoc publishing stuff
-site.settings
-
-ghpages.settings
-
-git.remoteRepo := "git@github.com:celadari/json-logic-scala.git"
+enablePlugins(GhpagesPlugin, SiteScaladocPlugin)
 
-site.includeScaladoc()
+git.remoteRepo := "git@github.com:celadari/json-logic-scala.git"

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=1.3.8

project/gpg.sbt

@@ -1,5 +1,5 @@
-resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
+resolvers += "jgit-repo" at "https://download.eclipse.org/jgit/maven"
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.2")  // https://github.com/sbt/sbt-ghpages
+addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "latest.integration")  // https://github.com/sbt/sbt-ghpages
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0") // https://github.com/sbt/sbt-osgi/
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "latest.integration")