diff --git a/debian/changelog b/debian/changelog index 86c2d1e..bb15f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jawn (0.11.1+really0.6.0-1) unstable; urgency=medium + + * Team upload. + * Reverted to the version 0.6.0 expected by SBT 0.13.x + + -- Emmanuel Bourg Wed, 14 Nov 2018 22:00:21 +0100 + jawn (0.11.1-1) unstable; urgency=medium * Team upload. diff --git a/debian/libjawn-java.poms b/debian/libjawn-java.poms index 7af3209..9d72351 100644 --- a/debian/libjawn-java.poms +++ b/debian/libjawn-java.poms @@ -1,9 +1,9 @@ -debian/poms/jawn-ast.pom --java-lib --usj-name=jawn-ast --artifact=ast/target/jawn-ast.jar +#debian/poms/jawn-ast.pom --java-lib --usj-name=jawn-ast --artifact=ast/target/jawn-ast.jar debian/poms/jawn-parser.pom --java-lib --usj-name=jawn-parser --artifact=parser/target/jawn-parser.jar -debian/poms/jawn-util.pom --java-lib --usj-name=jawn-util --artifact=util/target/jawn-util.jar +#debian/poms/jawn-util.pom --java-lib --usj-name=jawn-util --artifact=util/target/jawn-util.jar #debian/poms/jawn-argonaut.pom --java-lib --usj-name=jawn-argonaut --artifact=support/argonaut/target/jawn-argonaut.jar -debian/poms/jawn-json4s.pom --java-lib --usj-name=jawn-json4s --artifact=support/json4s/target/jawn-json4s.jar --relocate=org.spire-math:json4s-support +debian/poms/jawn-json4s.pom --java-lib --usj-name=jawn-json4s --artifact=support/json4s/target/jawn-json4s.jar #debian/poms/jawn-play.pom --java-lib --usj-name=jawn-play --artifact=support/play/target/jawn-play.jar #debian/poms/jawn-rojoma.pom --java-lib --usj-name=jawn-rojoma --artifact=support/rojoma/target/jawn-rojoma.jar #debian/poms/jawn-rojoma-v3.pom --java-lib --usj-name=jawn-rojoma-v3 --artifact=support/rojoma-v3/target/jawn-rojoma-v3.jar diff --git a/debian/patches/01-java11-compatibility.patch b/debian/patches/01-java11-compatibility.patch index ab46117..4b4498b 100644 --- a/debian/patches/01-java11-compatibility.patch +++ b/debian/patches/01-java11-compatibility.patch @@ -17,10 +17,10 @@ * update its own mutable position fields. */ final class ByteBufferParser[J](src: ByteBuffer) extends SyncParser[J] with ByteBasedParser[J] { -- private[this] final val start = src.position -- private[this] final val limit = src.limit - start -+ private[this] final val start = src.position() -+ private[this] final val limit = src.limit() - start +- final val start = src.position +- final val limit = src.limit - start ++ final val start = src.position() ++ final val limit = src.limit() - start - private[this] var lineState = 0 - protected[this] def line(): Int = lineState + var line = 0 + protected[this] final def newline(i: Int) { line += 1 } diff --git a/debian/poms/jawn-ast.pom b/debian/poms/jawn-ast.pom index 804dc6f..f0cc200 100644 --- a/debian/poms/jawn-ast.pom +++ b/debian/poms/jawn-ast.pom @@ -4,9 +4,9 @@ org.spire-math jawn-ast_2.11 jar - ast - http://github.com/non/jawn - 0.11.1 + jawn-ast + http://github.com/non/jawn/ + 0.6.0 MIT @@ -14,50 +14,50 @@ repo - ast + jawn-ast org.spire-math - http://github.com/non/jawn + http://github.com/non/jawn/ - - https://github.com/non/jawn - scm:git:git@github.com:non/jawn.git - - d_m + non Erik Osheim - erik@plastic-idolatry.com - http://github.com/non/ + http://github.com/non + + scm:git:github.com/non/jawn.git + scm:git:git@github.com:non/jawn.git + https://github.com/non/jawn + org.scala-lang scala-library - 2.11.11 + 2.11.2 org.spire-math jawn-parser_2.11 - 0.11.1 - - - org.spire-math - jawn-util_2.11 - 0.11.1 + 0.6.0 org.scalatest scalatest_2.11 - 3.0.3 + 2.1.6 test org.scalacheck scalacheck_2.11 - 1.13.5 + 1.11.4 test + + + org.spire-math + spire_2.11 + 0.7.4 diff --git a/debian/poms/jawn-json4s.pom b/debian/poms/jawn-json4s.pom index afce291..a63173e 100644 --- a/debian/poms/jawn-json4s.pom +++ b/debian/poms/jawn-json4s.pom @@ -2,11 +2,11 @@ 4.0.0 org.spire-math - jawn-json4s_2.11 + json4s-support_2.11 jar json4s-support - http://github.com/non/jawn - 0.11.1 + http://github.com/non/jawn/ + 0.6.0 MIT @@ -17,52 +17,47 @@ json4s-support org.spire-math - http://github.com/non/jawn + http://github.com/non/jawn/ - - https://github.com/non/jawn - scm:git:git@github.com:non/jawn.git - - d_m + non Erik Osheim - erik@plastic-idolatry.com - http://github.com/non/ + http://github.com/non + + scm:git:github.com/non/jawn.git + scm:git:git@github.com:non/jawn.git + https://github.com/non/jawn + org.scala-lang scala-library - 2.11.11 + 2.11.2 org.spire-math jawn-parser_2.11 - 0.11.1 - - - org.spire-math - jawn-util_2.11 - 0.11.1 + 0.6.0 org.scalatest scalatest_2.11 - 3.0.3 + 2.1.6 test org.scalacheck scalacheck_2.11 - 1.13.5 + 1.11.4 test org.json4s json4s-ast_2.11 - 3.5.2 + 3.2.10 diff --git a/debian/poms/jawn-parser.pom b/debian/poms/jawn-parser.pom index e094365..3e71a8a 100644 --- a/debian/poms/jawn-parser.pom +++ b/debian/poms/jawn-parser.pom @@ -4,9 +4,9 @@ org.spire-math jawn-parser_2.11 jar - parser - http://github.com/non/jawn - 0.11.1 + jawn-parser + http://github.com/non/jawn/ + 0.6.0 MIT @@ -14,39 +14,39 @@ repo - parser + jawn-parser org.spire-math - http://github.com/non/jawn + http://github.com/non/jawn/ - - https://github.com/non/jawn - scm:git:git@github.com:non/jawn.git - - d_m + non Erik Osheim - erik@plastic-idolatry.com - http://github.com/non/ + http://github.com/non + + scm:git:github.com/non/jawn.git + scm:git:git@github.com:non/jawn.git + https://github.com/non/jawn + org.scala-lang scala-library - 2.11.11 + 2.11.2 org.scalatest scalatest_2.11 - 3.0.3 + 2.1.6 test org.scalacheck scalacheck_2.11 - 1.13.5 + 1.11.4 test diff --git a/debian/rules b/debian/rules index 617e9f3..9af558f 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,14 @@ jar cf parser/target/jawn-parser.jar -C parser/target/classes . # util - mkdir -p util/target/classes - scalac -d util/target/classes $(shell find util/src/main/scala -name *.scala) - jar cf util/target/jawn-util.jar -C util/target/classes . + #mkdir -p util/target/classes + #scalac -d util/target/classes $(shell find util/src/main/scala -name *.scala) + #jar cf util/target/jawn-util.jar -C util/target/classes . # ast - mkdir -p ast/target/classes - scalac -d ast/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find ast/src/main/scala -name *.scala) - jar cf ast/target/jawn-ast.jar -C ast/target/classes . + #mkdir -p ast/target/classes + #scalac -d ast/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find ast/src/main/scala -name *.scala) + #jar cf ast/target/jawn-ast.jar -C ast/target/classes . # support/argonaut (requires io.argonaut:argonaut) #mkdir -p support/argonaut/target/classes; \