From 6cc05ad482c00c9fb1419ae4042bd67271aa4886 Mon Sep 17 00:00:00 2001 From: "Ross A. Baker" Date: Sun, 25 Oct 2020 15:45:26 -0400 Subject: [PATCH] Repackage under org.http4s to publish preview --- build.sbt | 1 + src/main/scala-2.12/parsley/XCompat.scala | 1 + src/main/scala-2.13/parsley/XCompat.scala | 1 + src/main/scala/parsley/Char.scala | 1 + src/main/scala/parsley/Combinator.scala | 3 ++- src/main/scala/parsley/Cont.scala | 3 ++- src/main/scala/parsley/ExpressionParser.scala | 1 + src/main/scala/parsley/Implicits.scala | 1 + src/main/scala/parsley/Parsley.scala | 1 + src/main/scala/parsley/Token.scala | 3 ++- src/main/scala/parsley/instructions/Context.scala | 1 + src/main/scala/parsley/instructions/CoreInstrs.scala | 3 ++- src/main/scala/parsley/instructions/IntrinsicInstrs.scala | 3 ++- src/main/scala/parsley/instructions/OptInstrs.scala | 1 + src/main/scala/parsley/instructions/TokenInstrs.scala | 3 ++- src/main/scala/parsley/instructions/package.scala | 1 + src/main/scala/parsley/package.scala | 2 ++ src/test/scala/parsley/CharTests.scala | 2 ++ src/test/scala/parsley/CombinatorTests.scala | 2 ++ src/test/scala/parsley/CoreTests.scala | 2 ++ src/test/scala/parsley/ErrorMessageTests.scala | 2 ++ src/test/scala/parsley/ExpressionParserTests.scala | 2 ++ src/test/scala/parsley/ParsleyTest.scala | 2 ++ src/test/scala/parsley/TokeniserTests.scala | 2 ++ 24 files changed, 38 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 31a304889..959cc832b 100644 --- a/build.sbt +++ b/build.sbt @@ -7,6 +7,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges lazy val root = project.in(file(".")) .settings( name := projectName, + organization := "org.http4s", version := parsleyVersion, target in Compile in doc := baseDirectory.value / "docs", diff --git a/src/main/scala-2.12/parsley/XCompat.scala b/src/main/scala-2.12/parsley/XCompat.scala index b8da573f2..0002ce1a5 100644 --- a/src/main/scala-2.12/parsley/XCompat.scala +++ b/src/main/scala-2.12/parsley/XCompat.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import scala.collection.mutable diff --git a/src/main/scala-2.13/parsley/XCompat.scala b/src/main/scala-2.13/parsley/XCompat.scala index 457ad760a..3e1b5c656 100644 --- a/src/main/scala-2.13/parsley/XCompat.scala +++ b/src/main/scala-2.13/parsley/XCompat.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import scala.collection.mutable diff --git a/src/main/scala/parsley/Char.scala b/src/main/scala/parsley/Char.scala index 740dc1b94..a5028fd9e 100644 --- a/src/main/scala/parsley/Char.scala +++ b/src/main/scala/parsley/Char.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import parsley.Parsley._ diff --git a/src/main/scala/parsley/Combinator.scala b/src/main/scala/parsley/Combinator.scala index 8cbf0664f..c19fb2245 100644 --- a/src/main/scala/parsley/Combinator.scala +++ b/src/main/scala/parsley/Combinator.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import parsley.Parsley._ @@ -213,4 +214,4 @@ object Combinator val _step = put(v, gets(v, step)) local(v, init, when(_cond, whileP(body *> _step *> _cond))) } -} \ No newline at end of file +} diff --git a/src/main/scala/parsley/Cont.scala b/src/main/scala/parsley/Cont.scala index db3191f11..c0cf532d1 100644 --- a/src/main/scala/parsley/Cont.scala +++ b/src/main/scala/parsley/Cont.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import scala.language.{higherKinds, reflectiveCalls} @@ -82,4 +83,4 @@ private [parsley] object Id i.asInstanceOf[Id[R, B]] } } -} \ No newline at end of file +} diff --git a/src/main/scala/parsley/ExpressionParser.scala b/src/main/scala/parsley/ExpressionParser.scala index 0084fc8c6..ace77b02b 100644 --- a/src/main/scala/parsley/ExpressionParser.scala +++ b/src/main/scala/parsley/ExpressionParser.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import scala.annotation.tailrec diff --git a/src/main/scala/parsley/Implicits.scala b/src/main/scala/parsley/Implicits.scala index 48c973332..3a95985ad 100644 --- a/src/main/scala/parsley/Implicits.scala +++ b/src/main/scala/parsley/Implicits.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import parsley.Char.{char, string} diff --git a/src/main/scala/parsley/Parsley.scala b/src/main/scala/parsley/Parsley.scala index 46a708c99..ba79e3df7 100644 --- a/src/main/scala/parsley/Parsley.scala +++ b/src/main/scala/parsley/Parsley.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import parsley.ContOps._ diff --git a/src/main/scala/parsley/Token.scala b/src/main/scala/parsley/Token.scala index cbea2f14c..deeed3e50 100644 --- a/src/main/scala/parsley/Token.scala +++ b/src/main/scala/parsley/Token.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import parsley.Char.{digit, hexDigit, octDigit, satisfy} @@ -649,4 +650,4 @@ private [parsley] object DeepToken { def unapply(self: MaxOp): Option[String] = Some(self.operator) } -} \ No newline at end of file +} diff --git a/src/main/scala/parsley/instructions/Context.scala b/src/main/scala/parsley/instructions/Context.scala index 9d1cf0b15..7ffabf5f7 100644 --- a/src/main/scala/parsley/instructions/Context.scala +++ b/src/main/scala/parsley/instructions/Context.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley.instructions import Stack._ diff --git a/src/main/scala/parsley/instructions/CoreInstrs.scala b/src/main/scala/parsley/instructions/CoreInstrs.scala index 21f45e407..f9cf4e053 100644 --- a/src/main/scala/parsley/instructions/CoreInstrs.scala +++ b/src/main/scala/parsley/instructions/CoreInstrs.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley.instructions import Stack.{isEmpty, push} @@ -560,4 +561,4 @@ private [parsley] object CharTok case '\t' => new Tab(expected) case _ => new CharTok(c, expected) } -} \ No newline at end of file +} diff --git a/src/main/scala/parsley/instructions/IntrinsicInstrs.scala b/src/main/scala/parsley/instructions/IntrinsicInstrs.scala index dcad4b13b..9198a0498 100644 --- a/src/main/scala/parsley/instructions/IntrinsicInstrs.scala +++ b/src/main/scala/parsley/instructions/IntrinsicInstrs.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley.instructions import parsley.{DeepEmbedding, UnsafeOption} @@ -460,4 +461,4 @@ private [parsley] class Eof(_expected: UnsafeOption[String]) extends Instr else ctx.fail(expected) } override final def toString: String = "Eof" -} \ No newline at end of file +} diff --git a/src/main/scala/parsley/instructions/OptInstrs.scala b/src/main/scala/parsley/instructions/OptInstrs.scala index 6048e2fd1..6a077d38c 100644 --- a/src/main/scala/parsley/instructions/OptInstrs.scala +++ b/src/main/scala/parsley/instructions/OptInstrs.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley.instructions import parsley.{UnsafeOption, XCompat} diff --git a/src/main/scala/parsley/instructions/TokenInstrs.scala b/src/main/scala/parsley/instructions/TokenInstrs.scala index 523b7db51..ecb246ca7 100644 --- a/src/main/scala/parsley/instructions/TokenInstrs.scala +++ b/src/main/scala/parsley/instructions/TokenInstrs.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley.instructions import parsley.DeepToken.Sign._ @@ -1296,4 +1297,4 @@ private [parsley] class TokenMaxOp(_operator: String, _ops: Set[String], _expect } override def toString: String = s"TokenMaxOp(${_operator})" -} \ No newline at end of file +} diff --git a/src/main/scala/parsley/instructions/package.scala b/src/main/scala/parsley/instructions/package.scala index b1f3aa4bb..a45668672 100644 --- a/src/main/scala/parsley/instructions/package.scala +++ b/src/main/scala/parsley/instructions/package.scala @@ -1,3 +1,4 @@ +package org.http4s package parsley import scala.annotation.tailrec diff --git a/src/main/scala/parsley/package.scala b/src/main/scala/parsley/package.scala index bdca0b84c..c8b894094 100644 --- a/src/main/scala/parsley/package.scala +++ b/src/main/scala/parsley/package.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley.instructions.Context import scala.annotation.{implicitAmbiguous, tailrec} diff --git a/src/test/scala/parsley/CharTests.scala b/src/test/scala/parsley/CharTests.scala index 15e8a4434..1564f0912 100644 --- a/src/test/scala/parsley/CharTests.scala +++ b/src/test/scala/parsley/CharTests.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley.Char._ import parsley.{Failure, runParser} import parsley.Parsley._ diff --git a/src/test/scala/parsley/CombinatorTests.scala b/src/test/scala/parsley/CombinatorTests.scala index c5dee7cb2..175fae506 100644 --- a/src/test/scala/parsley/CombinatorTests.scala +++ b/src/test/scala/parsley/CombinatorTests.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley.{Failure, Success, Var, runParser} import parsley.Combinator._ import parsley.Parsley._ diff --git a/src/test/scala/parsley/CoreTests.scala b/src/test/scala/parsley/CoreTests.scala index f33372ade..d5259d308 100644 --- a/src/test/scala/parsley/CoreTests.scala +++ b/src/test/scala/parsley/CoreTests.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley.{Failure, Parsley, Success, Var, runParser} import parsley.Parsley._ import parsley.Char.{char, satisfy} diff --git a/src/test/scala/parsley/ErrorMessageTests.scala b/src/test/scala/parsley/ErrorMessageTests.scala index 27ea1e957..25933efc3 100644 --- a/src/test/scala/parsley/ErrorMessageTests.scala +++ b/src/test/scala/parsley/ErrorMessageTests.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley.Combinator.eof import parsley.Parsley._ import parsley.{Failure, Parsley, runParser} diff --git a/src/test/scala/parsley/ExpressionParserTests.scala b/src/test/scala/parsley/ExpressionParserTests.scala index bfbd08468..0b5cdac44 100644 --- a/src/test/scala/parsley/ExpressionParserTests.scala +++ b/src/test/scala/parsley/ExpressionParserTests.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley.Char.digit import parsley.Implicits.{charLift, stringLift} import parsley.Combinator.{chainPost, chainPre, chainl1, chainr1} diff --git a/src/test/scala/parsley/ParsleyTest.scala b/src/test/scala/parsley/ParsleyTest.scala index 2a3399d4b..8bd0db59b 100644 --- a/src/test/scala/parsley/ParsleyTest.scala +++ b/src/test/scala/parsley/ParsleyTest.scala @@ -1,3 +1,5 @@ +package org.http4s + import org.scalatest.{Assertions, Matchers, FlatSpec} abstract class ParsleyTest extends FlatSpec with Matchers with Assertions diff --git a/src/test/scala/parsley/TokeniserTests.scala b/src/test/scala/parsley/TokeniserTests.scala index a0806c4dd..7b1d8bfca 100644 --- a/src/test/scala/parsley/TokeniserTests.scala +++ b/src/test/scala/parsley/TokeniserTests.scala @@ -1,3 +1,5 @@ +package org.http4s + import parsley._ import parsley.Char.{alphaNum, letter, whitespace, oneOf => inSet} import parsley.Implicits.charLift