Commit 31fe85c164dd24754367ec877374e6f1fbfe9cfb - jawn

+7

-0

debian/changelog less more

	0	jawn (0.11.1+really0.6.0-1) unstable; urgency=medium
	1
	2	* Team upload.
	3	* Reverted to the version 0.6.0 expected by SBT 0.13.x
	4
	5	-- Emmanuel Bourg <ebourg@apache.org> Wed, 14 Nov 2018 22:00:21 +0100
	6
0	7	jawn (0.11.1-1) unstable; urgency=medium
1	8
2	9	* Team upload.

+3

-3

debian/libjawn-java.poms less more

0		debian/poms/jawn-ast.pom --java-lib --usj-name=jawn-ast --artifact=ast/target/jawn-ast.jar
	0	#debian/poms/jawn-ast.pom --java-lib --usj-name=jawn-ast --artifact=ast/target/jawn-ast.jar
1	1	debian/poms/jawn-parser.pom --java-lib --usj-name=jawn-parser --artifact=parser/target/jawn-parser.jar
2		debian/poms/jawn-util.pom --java-lib --usj-name=jawn-util --artifact=util/target/jawn-util.jar
	2	#debian/poms/jawn-util.pom --java-lib --usj-name=jawn-util --artifact=util/target/jawn-util.jar
3	3
4	4	#debian/poms/jawn-argonaut.pom --java-lib --usj-name=jawn-argonaut --artifact=support/argonaut/target/jawn-argonaut.jar
5		debian/poms/jawn-json4s.pom --java-lib --usj-name=jawn-json4s --artifact=support/json4s/target/jawn-json4s.jar --relocate=org.spire-math:json4s-support
	5	debian/poms/jawn-json4s.pom --java-lib --usj-name=jawn-json4s --artifact=support/json4s/target/jawn-json4s.jar
6	6	#debian/poms/jawn-play.pom --java-lib --usj-name=jawn-play --artifact=support/play/target/jawn-play.jar
7	7	#debian/poms/jawn-rojoma.pom --java-lib --usj-name=jawn-rojoma --artifact=support/rojoma/target/jawn-rojoma.jar
8	8	#debian/poms/jawn-rojoma-v3.pom --java-lib --usj-name=jawn-rojoma-v3 --artifact=support/rojoma-v3/target/jawn-rojoma-v3.jar

+6

-6

debian/patches/01-java11-compatibility.patch less more

16	16	* update its own mutable position fields.
17	17	*/
18	18	final class ByteBufferParser[J](src: ByteBuffer) extends SyncParser[J] with ByteBasedParser[J] {
19		- private[this] final val start = src.position
20		- private[this] final val limit = src.limit - start
21		+ private[this] final val start = src.position()
22		+ private[this] final val limit = src.limit() - start
	19	- final val start = src.position
	20	- final val limit = src.limit - start
	21	+ final val start = src.position()
	22	+ final val limit = src.limit() - start
23	23
24		private[this] var lineState = 0
25		protected[this] def line(): Int = lineState
	24	var line = 0
	25	protected[this] final def newline(i: Int) { line += 1 }

+21

-21

debian/poms/jawn-ast.pom less more

3	3	<groupId>org.spire-math</groupId>
4	4	<artifactId>jawn-ast_2.11</artifactId>
5	5	<packaging>jar</packaging>
6		<description>ast</description>
7		<url>http://github.com/non/jawn</url>
8		<version>0.11.1</version>
	6	<description>jawn-ast</description>
	7	<url>http://github.com/non/jawn/</url>
	8	<version>0.6.0</version>
9	9	<licenses>
10	10	<license>
11	11	<name>MIT</name>

13	13	<distribution>repo</distribution>
14	14	</license>
15	15	</licenses>
16		<name>ast</name>
	16	<name>jawn-ast</name>
17	17	<organization>
18	18	<name>org.spire-math</name>
19		<url>http://github.com/non/jawn</url>
	19	<url>http://github.com/non/jawn/</url>
20	20	</organization>
21		<scm>
22		<url>https://github.com/non/jawn</url>
23		<connection>scm:git:git@github.com:non/jawn.git</connection>
24		</scm>
25	21	<developers>
26	22	<developer>
27		<id>d_m</id>
	23	<id>non</id>
28	24	<name>Erik Osheim</name>
29		<email>erik@plastic-idolatry.com</email>
30		<url>http://github.com/non/</url>
	25	<url>http://github.com/non</url>
31	26	</developer>
32	27	</developers>
	28	<scm>
	29	<connection>scm:git:github.com/non/jawn.git</connection>
	30	<developerConnection>scm:git:git@github.com:non/jawn.git</developerConnection>
	31	<url>https://github.com/non/jawn</url>
	32	</scm>
33	33	<dependencies>
34	34	<dependency>
35	35	<groupId>org.scala-lang</groupId>
36	36	<artifactId>scala-library</artifactId>
37		<version>2.11.11</version>
	37	<version>2.11.2</version>
38	38	</dependency>
39	39	<dependency>
40	40	<groupId>org.spire-math</groupId>
41	41	<artifactId>jawn-parser_2.11</artifactId>
42		<version>0.11.1</version>
43		</dependency>
44		<dependency>
45		<groupId>org.spire-math</groupId>
46		<artifactId>jawn-util_2.11</artifactId>
47		<version>0.11.1</version>
	42	<version>0.6.0</version>
48	43	</dependency>
49	44	<dependency>
50	45	<groupId>org.scalatest</groupId>
51	46	<artifactId>scalatest_2.11</artifactId>
52		<version>3.0.3</version>
	47	<version>2.1.6</version>
53	48	<scope>test</scope>
54	49	</dependency>
55	50	<dependency>
56	51	<groupId>org.scalacheck</groupId>
57	52	<artifactId>scalacheck_2.11</artifactId>
58		<version>1.13.5</version>
	53	<version>1.11.4</version>
59	54	<scope>test</scope>
	55	</dependency>
	56	<dependency>
	57	<groupId>org.spire-math</groupId>
	58	<artifactId>spire_2.11</artifactId>
	59	<version>0.7.4</version>
60	60	</dependency>
61	61	</dependencies>
62	62	</project>⏎

+16

-21

debian/poms/jawn-json4s.pom less more

1	1	<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
2	2	<modelVersion>4.0.0</modelVersion>
3	3	<groupId>org.spire-math</groupId>
4		<artifactId>jawn-json4s_2.11</artifactId>
	4	<artifactId>json4s-support_2.11</artifactId>
5	5	<packaging>jar</packaging>
6	6	<description>json4s-support</description>
7		<url>http://github.com/non/jawn</url>
8		<version>0.11.1</version>
	7	<url>http://github.com/non/jawn/</url>
	8	<version>0.6.0</version>
9	9	<licenses>
10	10	<license>
11	11	<name>MIT</name>

16	16	<name>json4s-support</name>
17	17	<organization>
18	18	<name>org.spire-math</name>
19		<url>http://github.com/non/jawn</url>
	19	<url>http://github.com/non/jawn/</url>
20	20	</organization>
21		<scm>
22		<url>https://github.com/non/jawn</url>
23		<connection>scm:git:git@github.com:non/jawn.git</connection>
24		</scm>
25	21	<developers>
26	22	<developer>
27		<id>d_m</id>
	23	<id>non</id>
28	24	<name>Erik Osheim</name>
29		<email>erik@plastic-idolatry.com</email>
30		<url>http://github.com/non/</url>
	25	<url>http://github.com/non</url>
31	26	</developer>
32	27	</developers>
	28	<scm>
	29	<connection>scm:git:github.com/non/jawn.git</connection>
	30	<developerConnection>scm:git:git@github.com:non/jawn.git</developerConnection>
	31	<url>https://github.com/non/jawn</url>
	32	</scm>
33	33	<dependencies>
34	34	<dependency>
35	35	<groupId>org.scala-lang</groupId>
36	36	<artifactId>scala-library</artifactId>
37		<version>2.11.11</version>
	37	<version>2.11.2</version>
38	38	</dependency>
39	39	<dependency>
40	40	<groupId>org.spire-math</groupId>
41	41	<artifactId>jawn-parser_2.11</artifactId>
42		<version>0.11.1</version>
43		</dependency>
44		<dependency>
45		<groupId>org.spire-math</groupId>
46		<artifactId>jawn-util_2.11</artifactId>
47		<version>0.11.1</version>
	42	<version>0.6.0</version>
48	43	</dependency>
49	44	<dependency>
50	45	<groupId>org.scalatest</groupId>
51	46	<artifactId>scalatest_2.11</artifactId>
52		<version>3.0.3</version>
	47	<version>2.1.6</version>
53	48	<scope>test</scope>
54	49	</dependency>
55	50	<dependency>
56	51	<groupId>org.scalacheck</groupId>
57	52	<artifactId>scalacheck_2.11</artifactId>
58		<version>1.13.5</version>
	53	<version>1.11.4</version>
59	54	<scope>test</scope>
60	55	</dependency>
61	56	<dependency>
62	57	<groupId>org.json4s</groupId>
63	58	<artifactId>json4s-ast_2.11</artifactId>
64		<version>3.5.2</version>
	59	<version>3.2.10</version>
65	60	</dependency>
66	61	</dependencies>
67	62	</project>⏎

+15

-15

debian/poms/jawn-parser.pom less more

3	3	<groupId>org.spire-math</groupId>
4	4	<artifactId>jawn-parser_2.11</artifactId>
5	5	<packaging>jar</packaging>
6		<description>parser</description>
7		<url>http://github.com/non/jawn</url>
8		<version>0.11.1</version>
	6	<description>jawn-parser</description>
	7	<url>http://github.com/non/jawn/</url>
	8	<version>0.6.0</version>
9	9	<licenses>
10	10	<license>
11	11	<name>MIT</name>

13	13	<distribution>repo</distribution>
14	14	</license>
15	15	</licenses>
16		<name>parser</name>
	16	<name>jawn-parser</name>
17	17	<organization>
18	18	<name>org.spire-math</name>
19		<url>http://github.com/non/jawn</url>
	19	<url>http://github.com/non/jawn/</url>
20	20	</organization>
21		<scm>
22		<url>https://github.com/non/jawn</url>
23		<connection>scm:git:git@github.com:non/jawn.git</connection>
24		</scm>
25	21	<developers>
26	22	<developer>
27		<id>d_m</id>
	23	<id>non</id>
28	24	<name>Erik Osheim</name>
29		<email>erik@plastic-idolatry.com</email>
30		<url>http://github.com/non/</url>
	25	<url>http://github.com/non</url>
31	26	</developer>
32	27	</developers>
	28	<scm>
	29	<connection>scm:git:github.com/non/jawn.git</connection>
	30	<developerConnection>scm:git:git@github.com:non/jawn.git</developerConnection>
	31	<url>https://github.com/non/jawn</url>
	32	</scm>
33	33	<dependencies>
34	34	<dependency>
35	35	<groupId>org.scala-lang</groupId>
36	36	<artifactId>scala-library</artifactId>
37		<version>2.11.11</version>
	37	<version>2.11.2</version>
38	38	</dependency>
39	39	<dependency>
40	40	<groupId>org.scalatest</groupId>
41	41	<artifactId>scalatest_2.11</artifactId>
42		<version>3.0.3</version>
	42	<version>2.1.6</version>
43	43	<scope>test</scope>
44	44	</dependency>
45	45	<dependency>
46	46	<groupId>org.scalacheck</groupId>
47	47	<artifactId>scalacheck_2.11</artifactId>
48		<version>1.13.5</version>
	48	<version>1.11.4</version>
49	49	<scope>test</scope>
50	50	</dependency>
51	51	</dependencies>

+6

-6

debian/rules less more

17	17	jar cf parser/target/jawn-parser.jar -C parser/target/classes .
18	18
19	19	# util
20		mkdir -p util/target/classes
21		scalac -d util/target/classes $(shell find util/src/main/scala -name *.scala)
22		jar cf util/target/jawn-util.jar -C util/target/classes .
	20	#mkdir -p util/target/classes
	21	#scalac -d util/target/classes $(shell find util/src/main/scala -name *.scala)
	22	#jar cf util/target/jawn-util.jar -C util/target/classes .
23	23
24	24	# ast
25		mkdir -p ast/target/classes
26		scalac -d ast/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find ast/src/main/scala -name *.scala)
27		jar cf ast/target/jawn-ast.jar -C ast/target/classes .
	25	#mkdir -p ast/target/classes
	26	#scalac -d ast/target/classes -cp parser/target/jawn-parser.jar:util/target/jawn-util.jar $(shell find ast/src/main/scala -name *.scala)
	27	#jar cf ast/target/jawn-ast.jar -C ast/target/classes .
28	28
29	29	# support/argonaut (requires io.argonaut:argonaut)
30	30	#mkdir -p support/argonaut/target/classes; \