Cross-compile to Scala 2.12. Also bring into pico-works organisation

Author: newhoggy

build.sbt

@@ -1,7 +1,7 @@
 name := "hashids-scala"
 
-organization := "io.john-ky"
+organization := "pico-works"
 
-crossScalaVersions := Seq("2.10.5", "2.11.6")
+crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
 
-version in ThisBuild := buildVersion
+version in ThisBuild := Process("./version.sh").lines.head.trim

hashids-scala/src/main/scala/org/hashids/Hashids.scala renamed to hashids-scala/src/main/scala/org/pico/hashids/Hashids.scala

@@ -1,7 +1,7 @@
-package org.hashids
+package org.pico.hashids
 
 import scala.annotation.tailrec
-import org.hashids.impl._
+import org.pico.hashids.impl._
 
 class Hashids(
     salt: String = "",
@@ -14,7 +14,7 @@ class Hashids(
     if (numbers.isEmpty) {
       ""
     } else {
-      org.hashids.impl.encode(numbers:_*)(effectiveAlphabet, minHashLength, salt, seps, guards)
+      org.pico.hashids.impl.encode(numbers:_*)(effectiveAlphabet, minHashLength, salt, seps, guards)
     }
   }
 
@@ -31,13 +31,13 @@ class Hashids(
         result
     }
 
-    org.hashids.impl.encode(doSplit(Nil):_*)(effectiveAlphabet, minHashLength, salt, seps, guards)
+    org.pico.hashids.impl.encode(doSplit(Nil):_*)(effectiveAlphabet, minHashLength, salt, seps, guards)
   }
 
   def decode(hash: String): List[Long] = hash match {
     case "" => Nil
     case x =>
-      val res = org.hashids.impl.decode(x)(effectiveAlphabet, salt, seps, guards)
+      val res = org.pico.hashids.impl.decode(x)(effectiveAlphabet, salt, seps, guards)
 
       if (res.exists(_ < 0)) {
         List.empty

hashids-scala/src/main/scala/org/hashids/impl/package.scala renamed to hashids-scala/src/main/scala/org/pico/hashids/impl/package.scala

@@ -1,4 +1,4 @@
-package org.hashids
+package org.pico.hashids
 
 import scala.annotation.tailrec
 

hashids-scala/src/main/scala/org/hashids/syntax/package.scala renamed to hashids-scala/src/main/scala/org/pico/hashids/syntax/package.scala

@@ -1,4 +1,4 @@
-package org.hashids
+package org.pico.hashids
 
 package object syntax {
   implicit class HashidsLongOps(x: Long) {

hashids-scala/src/test/scala/org/hashids/CheckHashids.scala

@@ -1,6 +1,6 @@
-package org.hashids
+package org.pico.hashids
 
-import org.hashids.syntax._
+import org.pico.hashids.syntax._
 import org.scalacheck.{Arbitrary, Gen}
 import org.specs2.ScalaCheck
 import org.specs2.mutable.Specification

hashids-scala/src/test/scala/org/hashids/SpecHashids.scala

@@ -1,6 +1,6 @@
-package org.hashids
+package org.pico.hashids
 
-import org.hashids.syntax._
+import org.pico.hashids.syntax._
 import org.scalacheck.Gen
 import org.specs2.ScalaCheck
 import org.specs2.mutable._

project/Build.scala

@@ -1,10 +1,10 @@
 import sbt._
 import Keys._
 
-object Build extends Build with Version {
-  val specs2_core       = "org.specs2"      %%  "specs2-core"         % "3.6.2"
-  val specs2_scalacheck = "org.specs2"      %%  "specs2-scalacheck"   % "3.6.2"
-  val scalacheck        = "org.scalacheck"  %%  "scalacheck"          % "1.12.4"
+object Build extends sbt.Build {
+  val specs2_core       = "org.specs2"      %%  "specs2-core"         % "3.8.8"
+  val specs2_scalacheck = "org.specs2"      %%  "specs2-scalacheck"   % "3.8.8"
+  val scalacheck        = "org.scalacheck"  %%  "scalacheck"          % "1.13.4"
 
   implicit class ProjectOps(self: Project) {
     def standard: Project = {

project/Version.scala

@@ -1 +1 @@
-sbt.version=0.13.6
+sbt.version=0.13.13

project/build.properties

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+_major_minor="$(cat version.txt | xargs)"
+_commits="$(git rev-list --count HEAD)"
+_hash="$(git rev-parse --short HEAD)"
+
+if [ "${CIRCLE_PROJECT_USERNAME:-}" = "pico-works" ] && [ "${CIRCLE_BRANCH:-}" = "master" ]; then
+    echo "$_major_minor.$_commits"
+else
+    echo "$_major_minor.$_commits-$_hash"
+fi

sbt

@@ -0,0 +1 @@
+4.4