Fork: rename organizationv1.3.5-5

7 files changed, 80 insertions, 18 deletions

diff --git a/.ci/build b/.ci/build
new file mode 100755
index 0000000..0a354a1
--- /dev/null
+++ b/.ci/build
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o verbose
+
+sbt \
+    +test \
+    +sprayJsonJVM/mimaReportBinaryIssues
+
+# Automatic publishing for tags that start with `v<digit>`
+if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_TAG" =~ ^v[0-9].* ]]; then
+    # Setup gpg keys
+    gpg --keyserver keyserver.ubuntu.com --recv-keys \
+	"DC6A9A5E884B2D680E080467E107A4A6CF561C67" \
+	|| echo "WARNING: unable to refresh key; it may be out of date." >&2
+    openssl aes-256-cbc \
+	    -K "$encrypted_f81da6a1e6e0_key" \
+	    -iv "$encrypted_f81da6a1e6e0_iv" \
+	    -in .ci/sec.gpg.enc \
+	    -out sec.gpg \
+	    -d
+    gpg --import sec.gpg
+
+    # Setup publishing
+    cat <<-EOF > sonatype.sbt
+	credentials in Global += Credentials(
+	    "GnuPG Key ID",
+	    "gpg",
+	    "DC6A9A5E884B2D680E080467E107A4A6CF561C67",
+	    "ignored"
+	)
+	credentials in Global += Credentials(
+	    "Sonatype Nexus Repository Manager",
+	    "oss.sonatype.org",
+	    "8VNUX6+2",
+	    "$SONATYPE_PASS"
+	)
+	EOF
+
+    # Build and publish
+    sbt \
+	+sprayJsonJVM/publish \
+	+sprayJsonJS/publish \
+	+sprayJsonNative/publish \
+	sonatypeRelease
+fi
diff --git a/.ci/sec.gpg.enc b/.ci/sec.gpg.enc
new file mode 100644
index 0000000..f596fce
--- /dev/null
+++ b/.ci/sec.gpg.enc
diff --git a/.travis.yml b/.travis.yml
index eb8d2d8..3619cfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,23 +5,21 @@ language: scala
 jdk:
   - oraclejdk8
 
+env:
+  global:
+    secure: efWQKYAykm6LPAP+xhNrDe542eIBJ9Sp/mV6IoUatpJhpLBV121Ln5tcLbwHrbNFNL8Zv5KcvuV6/oAoHi/Qw6TksZfNaUZCCiaKv04lEsTVMVcGQTUv633HEBunJkGswsZtnHrlXLOD2lsdnS9QPmPI+iQFqRGjAMloN+G3gyrei5W+3Y8Lkrherf5nsl5S2i2MFQdzP3JVqjszXLRys86/xWp8vgWg1zQQ8zP/FJUX0qTaNAc/N6M5Lv56fJ4bmNBeILTkCpOTmnP2dE+C7BkfzmgCVdxvEc2elb6YUooZRWgWJkZ0G51CBMHTWTi3/yT0IMttJrsMSbNVXT4F3/RYXJ/4rO04u9ut3vS9MCfJoZJVDaAetXo6pm9klxakkKYazisz8pdufcNFBlMQcJW53MlGQfXW3LFb/e7wGOX0Y27CtVjBl+qKuHjmMYC97eInfxKKBR/ycmE4NQC606yRTKbTQTI4Uset70BiqQClJ1pqBehxijnB9v1RvSA/jEoCzWowBY+8zac12GvUgTFAB7DGmzrWr6DhRe2GHNfZ8Az02AGIv+IZq/3u/MD3MGMRGZBIxoZglhCD1vmIVUslDF8EeCgzXqkAlqP/77rjK+UnerHWcVtUCv7zjR60Lnh+2lAD2HcBbzJdwNLszfB5hdBjNOgZeMJ+OACa8hY=
+
 before_install:
   - curl https://raw.githubusercontent.com/scala-native/scala-native/4c2ce46242f872f3e7879810565147c4233cd52e/scripts/travis_setup.sh | bash -x
 
-script:
-  - sbt +test +mimaReportBinaryIssues
+script: .ci/build
 
 before_cache:
   - find $HOME/.sbt -name "*.lock" | xargs rm
   - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
-  - rm -rf $HOME/.ivy2/{cache,local}/io.spray/
+  - rm -rf $HOME/.ivy2/{cache,local}/io.crashbox/
 
 cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot/
-
-#notifications:
-#  email:
-#    - johannes@spray.io
-#    - mathias@spray.io
diff --git a/README.markdown b/README.markdown
index 7494184..911cec7 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,3 +1,17 @@
+[![Build Status](https://travis-ci.org/jodersky/spray-json.svg?branch=master)](https://travis-ci.org/jodersky/spray-json)
+[![Download](https://img.shields.io/maven-central/v/io.crashbox/spray-json_2.12.svg)](https://search.maven.org/#search|ga|1|io.crashbox%20spray-json-)
+
+*This repository is a fork of the spray-json project. Its purpose is
+to make spray available for ScalaJS and ScalaNative.*
+
+*It remains fully binary compatible with the upstream project and can
+be used as a drop-in replacement on the JVM.*
+
+```scala
+libraryDependencies += "io.crashbox" %%% "spray-json" % "<latest_version>"
+```
+----
+
 _spray-json_ is a lightweight, clean and efficient [JSON] implementation in Scala.
 
 It supports the following features:
diff --git a/build.sbt b/build.sbt
index 6dba46e..2a015b5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,7 +13,6 @@ lazy val sprayJson =
     .in(file("."))
     .settings(
       name := "spray-json",
-      version := "1.3.6-SNAPSHOT",
       scalaVersion := crossScalaVersions.value.head,
       scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-Xlint", "-encoding", "utf8"),
       (scalacOptions in doc) ++= Seq("-doc-title", name.value + " " + version.value),
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3cdb1d8..736a37d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,11 +1,12 @@
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")
-
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "0.6.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "0.6.27")
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.3.8")
+
+addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
diff --git a/publish.sbt b/publish.sbt
index 4dfcd29..3c2ade7 100644
--- a/publish.sbt
+++ b/publish.sbt
@@ -1,12 +1,11 @@
 inThisBuild(Seq(
-  organization := "io.spray",
-  organizationHomepage := Some(new URL("http://spray.io")),
+  organization := "io.crashbox",
+  organizationHomepage := Some(new URL("https://crashbox.io")),
   description := "A Scala library for easy and idiomatic JSON (de)serialization",
-  homepage := Some(new URL("https://github.com/spray/spray-json")),
+  homepage := Some(new URL("https://github.com/jodersky/spray-json")),
   startYear := Some(2011),
   licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")),
   publishMavenStyle := true,
-  useGpg := true,
   publishTo := {
     val nexus = "https://oss.sonatype.org/"
     if (version.value.trim.endsWith("SNAPSHOT"))
@@ -17,11 +16,16 @@ inThisBuild(Seq(
   pomIncludeRepository := { _ => false },
   pomExtra :=
     <scm>
-      <url>git://github.com/spray/spray.git</url>
-      <connection>scm:git:git@github.com:spray/spray.git</connection>
+      <url>git://github.com/jodersky/spray-json.git</url>
+      <connection>scm:git:git@github.com:jodersky/spray-json.git</connection>
     </scm>
       <developers>
         <developer><id>sirthias</id><name>Mathias Doenitz</name></developer>
         <developer><id>jrudolph</id><name>Johannes Rudolph</name></developer>
-      </developers>
+        <developer><id>jodersky</id><name>Jakob Odersky</name></developer>
+      </developers>,
+  version := {
+    import sys.process._
+    ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim
+  }
 ))