From ec3295303cc2e6650d2529528608fcd572d29b18 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Fri, 1 Dec 2023 20:35:54 +0100 Subject: [PATCH 01/17] Build for scala3, scala-native and scala-js --- .gitignore | 3 +- .sbtopts | 2 + README.rst | 4 +- build.sbt | 26 ++++++------ project/build.properties | 2 +- project/plugins.sbt | 7 +++- .../src}/main/scala/scaposer/I18n.scala | 2 +- .../main/scala/scaposer/ParseFailure.scala | 0 .../src}/main/scala/scaposer/Parser.scala | 2 +- .../PluralIndexExpressionParser.scala | 42 +++++++++---------- .../main/scala/scaposer/Translation.scala | 0 .../src}/test/scala/scaposer/I18nSpec.scala | 0 .../src}/test/scala/scaposer/ParserSpec.scala | 2 +- 13 files changed, 49 insertions(+), 43 deletions(-) create mode 100644 .sbtopts rename {src => scaposer/src}/main/scala/scaposer/I18n.scala (99%) rename {src => scaposer/src}/main/scala/scaposer/ParseFailure.scala (100%) rename {src => scaposer/src}/main/scala/scaposer/Parser.scala (98%) rename {src => scaposer/src}/main/scala/scaposer/PluralIndexExpressionParser.scala (65%) rename {src => scaposer/src}/main/scala/scaposer/Translation.scala (100%) rename {src => scaposer/src}/test/scala/scaposer/I18nSpec.scala (100%) rename {src => scaposer/src}/test/scala/scaposer/ParserSpec.scala (99%) diff --git a/.gitignore b/.gitignore index f117627..eb85297 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -.* project/project project/target target +.idea +.bsp \ No newline at end of file diff --git a/.sbtopts b/.sbtopts new file mode 100644 index 0000000..3cc545d --- /dev/null +++ b/.sbtopts @@ -0,0 +1,2 @@ +-Dfile.encoding=UTF-8 +-J-Xmx2g diff --git a/README.rst b/README.rst index 78193ba..8fcc454 100644 --- a/README.rst +++ b/README.rst @@ -112,12 +112,12 @@ i18n2 will overwrite those in i18n1. Use with SBT ------------ -Supported Scala versions: 2.11-2.13 +Supported Scala versions: 2.13-3 build.sbt example: :: - libraryDependencies += "tv.cntt" %% "scaposer" % "1.11.1" + libraryDependencies += "tv.cntt" %% "scaposer" % "1.12.0" Scaposer is used in `Xitrum web framework `_. diff --git a/build.sbt b/build.sbt index bfba97e..cda9f01 100644 --- a/build.sbt +++ b/build.sbt @@ -1,17 +1,17 @@ -organization := "tv.cntt" -name := "scaposer" -version := "1.11.1-SNAPSHOT" +lazy val `scaposer` = crossProject(JSPlatform, JVMPlatform, NativePlatform) + .crossType(CrossType.Pure) + .settings( + organization := "tv.cntt", + name := "scaposer", + version := "1.12.0-SNAPSHOT", -scalaVersion := "2.13.0" -crossScalaVersions := Seq("2.13.0", "2.12.8", "2.11.12") + scalaVersion := "2.13.12", + crossScalaVersions := Seq(scalaVersion.value, "2.12.18", "3.3.1"), -scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked") -javacOptions ++= Seq("-source", "1.8", "-target", "1.8") + scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked"), + javacOptions ++= Seq("-source", "1.8", "-target", "1.8"), -// Scala 2.11+ core does not include scala.util.parsing.combinator -libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2" + libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.3.0", -libraryDependencies += "org.specs2" %% "specs2-core" % "4.6.0" % "test" - -//https://github.com/scala/scala-parser-combinators/issues/197 -fork in Test := true \ No newline at end of file + libraryDependencies += "org.specs2" %%% "specs2-core" % "4.20.3" % Test, + ) diff --git a/project/build.properties b/project/build.properties index 8e682c5..e8a1e24 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.18 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index b599e4d..25e05a5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,5 @@ -// Run sbt eclipse to create Eclipse project file -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") + diff --git a/src/main/scala/scaposer/I18n.scala b/scaposer/src/main/scala/scaposer/I18n.scala similarity index 99% rename from src/main/scala/scaposer/I18n.scala rename to scaposer/src/main/scala/scaposer/I18n.scala index edbb441..627f061 100644 --- a/src/main/scala/scaposer/I18n.scala +++ b/scaposer/src/main/scala/scaposer/I18n.scala @@ -168,7 +168,7 @@ case class I18n(ctxSingularToStrs: Map[(String, String), Seq[String]]) { } else { pluralFormso.map { expr => PluralIndexExpressionParser(expr) match { - case PluralIndexExpressionParser.Success(result, _) => x: Long => result(x).toInt + case PluralIndexExpressionParser.Success(result, _) => (x: Long) => result(x).toInt case failure: PluralIndexExpressionParser.NoSuccess => fallbackPluralFormEvaluator _ } }.getOrElse(fallbackPluralFormEvaluator _) diff --git a/src/main/scala/scaposer/ParseFailure.scala b/scaposer/src/main/scala/scaposer/ParseFailure.scala similarity index 100% rename from src/main/scala/scaposer/ParseFailure.scala rename to scaposer/src/main/scala/scaposer/ParseFailure.scala diff --git a/src/main/scala/scaposer/Parser.scala b/scaposer/src/main/scala/scaposer/Parser.scala similarity index 98% rename from src/main/scala/scaposer/Parser.scala rename to scaposer/src/main/scala/scaposer/Parser.scala index da303e5..59a99d1 100644 --- a/src/main/scala/scaposer/Parser.scala +++ b/scaposer/src/main/scala/scaposer/Parser.scala @@ -42,7 +42,7 @@ private class Parser extends JavaTokenParsers { * `b`, `f`, `n`, `r` or `t`. * - `\` followed by `u` followed by four hexadecimal digits */ - private val reStringLiteral: Parser[String] = + private val reStringLiteral: this.Parser[String] = ("\""+"""((\\\")|\p{Space}|\\u[a-fA-F0-9]{4}|[^"\p{Cntrl}\\]|\\[\\/bfnrt])*"""+"\"").r // Scala regex is single line by default diff --git a/src/main/scala/scaposer/PluralIndexExpressionParser.scala b/scaposer/src/main/scala/scaposer/PluralIndexExpressionParser.scala similarity index 65% rename from src/main/scala/scaposer/PluralIndexExpressionParser.scala rename to scaposer/src/main/scala/scaposer/PluralIndexExpressionParser.scala index cdebf1f..65e8f41 100644 --- a/src/main/scala/scaposer/PluralIndexExpressionParser.scala +++ b/scaposer/src/main/scala/scaposer/PluralIndexExpressionParser.scala @@ -4,13 +4,13 @@ import scala.util.parsing.combinator.RegexParsers object PluralIndexExpressionParser extends RegexParsers { private def wholeExpr = nplurals ~ assign ~ integerConst ~ endExpr ~ plural ~ assign ~ subexpr ~ endExpr ^^ { - case _ ~ _ ~ maxIndex ~ _ ~ _ ~ _ ~ f ~ _ => x: Long => Math.min(f(Math.max(x, 0L)), maxIndex) + case _ ~ _ ~ maxIndex ~ _ ~ _ ~ _ ~ f ~ _ => (x: Long) => Math.min(f(Math.max(x, 0L)), maxIndex) } def apply(input: String): ParseResult[Long => Long] = parseAll(wholeExpr, input) final private val assign = "=" - final private val equals = "==" + final private val equals_ = "==" final private val notEquals = "!=" final private val greater = ">" final private val less = "<" @@ -36,13 +36,13 @@ object PluralIndexExpressionParser extends RegexParsers { final private val endExpr = ";" private def number = """\d+""".r ^^ { str => - x: Long => str.toLong + (x: Long) => str.toLong } private def integerConst = """\d+""".r ^^ (_.toInt) private def n = "n" ^^ { _ => - x: Long => x.toLong + (x: Long) => x.toLong } private def subexpr = ternary | logicToNumber | expr @@ -51,44 +51,44 @@ object PluralIndexExpressionParser extends RegexParsers { private def term: Parser[Long => Long] = value ~ rep(multuply ~ value | divide ~ value | mod ~ value) ^^ { case number ~ list => list.foldLeft(number) { - case (x, `multuply` ~ y) => t: Long => x(t) * y(t) - case (x, `divide` ~ y) => t: Long => x(t) / y(t) - case (x, `mod` ~ y) => t: Long => x(t) % y(t) + case (x, `multuply` ~ y) => (t: Long) => x(t) * y(t) + case (x, `divide` ~ y) => (t: Long) => x(t) / y(t) + case (x, `mod` ~ y) => (t: Long) => x(t) % y(t) } } private def expr: Parser[Long => Long] = term ~ rep(plus ~ term | minus ~ term) ^^ { case number ~ list => list.foldLeft(number) { - case (x, `plus` ~ y) => t: Long => x(t) + y(t) - case (x, `minus` ~ y) => t: Long => x(t) - y(t) + case (x, `plus` ~ y) => (t: Long) => x(t) + y(t) + case (x, `minus` ~ y) => (t: Long) => x(t) - y(t) } } - private def compare = expr ~ (greaterOrEquals| lessOrEquals | notEquals | equals | greater | less) ~ expr ^^ { - case a ~ `greaterOrEquals` ~ b => x: Long => a(x) >= b(x) - case a ~ `lessOrEquals` ~ b => x: Long => a(x) <= b(x) - case a ~ `notEquals` ~ b => x: Long => a(x) != b(x) - case a ~ `equals` ~ b => x: Long => a(x) == b(x) - case a ~ `greater` ~ b => x: Long => a(x) > b(x) - case a ~ `less` ~ b => x: Long => a(x) < b(x) + private def compare = expr ~ (greaterOrEquals| lessOrEquals | notEquals | equals_ | greater | less) ~ expr ^^ { + case a ~ `greaterOrEquals` ~ b => (x: Long) => a(x) >= b(x) + case a ~ `lessOrEquals` ~ b => (x: Long) => a(x) <= b(x) + case a ~ `notEquals` ~ b => (x: Long) => a(x) != b(x) + case a ~ `equals_` ~ b => (x: Long) => a(x) == b(x) + case a ~ `greater` ~ b => (x: Long) => a(x) > b(x) + case a ~ `less` ~ b => (x: Long) => a(x) < b(x) } private def logic: Parser[Long => Boolean] = (openBrace ~> (logic) <~ closeBrace) | (compare ~ rep(logicalAnd ~ logic | logicalOr ~ logic) ^^ { case compare ~ list => list.foldLeft(compare) { - case (x, `logicalAnd` ~ y) => t: Long => x(t) && y(t) - case (x, `logicalOr` ~ y) => t: Long => x(t) || y(t) + case (x, `logicalAnd` ~ y) => (t: Long) => x(t) && y(t) + case (x, `logicalOr` ~ y) => (t: Long) => x(t) || y(t) } }) private def logicToNumber: Parser[Long => Long] = logic ^^ { x => - t: Long => if (x(t)) 1 else 0 + (t: Long) => if (x(t)) 1 else 0 } private def negLogic = negation ~ openBrace ~ logic ~ closeBrace ^^ { - case _ ~ _ ~ x ~ _ => t: Long => !x(t) + case _ ~ _ ~ x ~ _ => (t: Long) => !x(t) } private def ternary: Parser[Long => Long] = (logic | negLogic) ~ "?" ~ subexpr ~ ":" ~ subexpr ^^ { - case logic ~ _ ~ yes ~ _ ~ no => x: Long => if (logic(x)) yes(x) else no(x) + case logic ~ _ ~ yes ~ _ ~ no => (x: Long) => if (logic(x)) yes(x) else no(x) } } diff --git a/src/main/scala/scaposer/Translation.scala b/scaposer/src/main/scala/scaposer/Translation.scala similarity index 100% rename from src/main/scala/scaposer/Translation.scala rename to scaposer/src/main/scala/scaposer/Translation.scala diff --git a/src/test/scala/scaposer/I18nSpec.scala b/scaposer/src/test/scala/scaposer/I18nSpec.scala similarity index 100% rename from src/test/scala/scaposer/I18nSpec.scala rename to scaposer/src/test/scala/scaposer/I18nSpec.scala diff --git a/src/test/scala/scaposer/ParserSpec.scala b/scaposer/src/test/scala/scaposer/ParserSpec.scala similarity index 99% rename from src/test/scala/scaposer/ParserSpec.scala rename to scaposer/src/test/scala/scaposer/ParserSpec.scala index cbcd151..2d49395 100644 --- a/src/test/scala/scaposer/ParserSpec.scala +++ b/scaposer/src/test/scala/scaposer/ParserSpec.scala @@ -121,7 +121,7 @@ class ParserSpec extends Specification { private def getPluralIndexEvaluator(expr: String) = { PluralIndexExpressionParser(expr.replace(" ", "")).map { f => - n: Long => f(n).toInt + (n: Long) => f(n).toInt }.get } } From 5bc27ceae03e7b5c4ac1b0b15c1f8bcad92091c0 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 14:59:08 +0100 Subject: [PATCH 02/17] add publishing settings --- build.sbt | 50 +++++++++++++++++++++++++++++++++++++++++++-- project/plugins.sbt | 3 +++ version.sbt | 1 + 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 version.sbt diff --git a/build.sbt b/build.sbt index cda9f01..49aa307 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,7 @@ lazy val `scaposer` = crossProject(JSPlatform, JVMPlatform, NativePlatform) .crossType(CrossType.Pure) .settings( - organization := "tv.cntt", name := "scaposer", - version := "1.12.0-SNAPSHOT", scalaVersion := "2.13.12", crossScalaVersions := Seq(scalaVersion.value, "2.12.18", "3.3.1"), @@ -15,3 +13,51 @@ lazy val `scaposer` = crossProject(JSPlatform, JVMPlatform, NativePlatform) libraryDependencies += "org.specs2" %%% "specs2-core" % "4.20.3" % Test, ) + +ThisBuild / organization := "io.github.olegych" +ThisBuild / organizationName := "OlegYch" +ThisBuild / organizationHomepage := Some(url("https://github.com/OlegYch")) + +ThisBuild / scmInfo := Some( + ScmInfo( + url("https://github.com/OlegYch/scala-dzi"), + "scm:git@github.com:OlegYch/scala-dzi.git" + ) +) +ThisBuild / developers := List( + Developer( + id = "OlegYch", + name = "Aleh Aleshka", + email = "oleglbch@gmail.com", + url = url("https://github.com/OlegYch") + ) +) + +ThisBuild / description := "GNU Gettext .po file loader for Scala" +ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/license/mit/")) +ThisBuild / homepage := Some(url("https://github.com/OlegYch/scaposer")) + +// Remove all additional repository other than Maven Central from POM +ThisBuild / pomIncludeRepository := { _ => false } +ThisBuild / publishMavenStyle := true +ThisBuild / publishTo := sonatypePublishToBundle.value +ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org" +ThisBuild / sonatypeProfileName := "OlegYch" +ThisBuild / releaseCrossBuild := true + +import ReleaseTransformations._ +ThisBuild / versionScheme := Some("early-semver") +releaseProcess := Seq[ReleaseStep]( + checkSnapshotDependencies, + inquireVersions, + runClean, + runTest, + setReleaseVersion, + commitReleaseVersion, + tagRelease, + releaseStepCommandAndRemaining("publishSigned"), + releaseStepCommand("sonatypeBundleRelease"), + setNextVersion, + commitNextVersion, + pushChanges +) diff --git a/project/plugins.sbt b/project/plugins.sbt index 25e05a5..91286ba 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,3 +3,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") \ No newline at end of file diff --git a/version.sbt b/version.sbt new file mode 100644 index 0000000..0c0088e --- /dev/null +++ b/version.sbt @@ -0,0 +1 @@ +ThisBuild / version := "1.12.0-SNAPSHOT" From 8088903cd75fb2b97c2dd76656f7c09314c42f42 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 15:24:14 +0100 Subject: [PATCH 03/17] Setting version to 1.12.0 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 0c0088e..dc4133a 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.0-SNAPSHOT" +ThisBuild / version := "1.12.0" From 97f238449854f5221e0266d8b0557e11dfa4b305 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:06:58 +0100 Subject: [PATCH 04/17] Setting version to 1.12.1-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index dc4133a..b30e965 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.0" +ThisBuild / version := "1.12.1-SNAPSHOT" From 5455e8c1aabb82fe957363a315867501f0dfd6d5 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:22:03 +0100 Subject: [PATCH 05/17] try to fix cross release --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 49aa307..db92d9a 100644 --- a/build.sbt +++ b/build.sbt @@ -3,9 +3,6 @@ lazy val `scaposer` = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( name := "scaposer", - scalaVersion := "2.13.12", - crossScalaVersions := Seq(scalaVersion.value, "2.12.18", "3.3.1"), - scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked"), javacOptions ++= Seq("-source", "1.8", "-target", "1.8"), @@ -14,6 +11,9 @@ lazy val `scaposer` = crossProject(JSPlatform, JVMPlatform, NativePlatform) libraryDependencies += "org.specs2" %%% "specs2-core" % "4.20.3" % Test, ) +ThisBuild / scalaVersion := "2.13.12" +ThisBuild / crossScalaVersions := Seq(scalaVersion.value, "2.12.18", "3.3.1") + ThisBuild / organization := "io.github.olegych" ThisBuild / organizationName := "OlegYch" ThisBuild / organizationHomepage := Some(url("https://github.com/OlegYch")) From 3716ca0ca17d00e0b77d1c1a2f982e303577873b Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:23:04 +0100 Subject: [PATCH 06/17] fix typo --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index db92d9a..4c8e07b 100644 --- a/build.sbt +++ b/build.sbt @@ -20,8 +20,8 @@ ThisBuild / organizationHomepage := Some(url("https://github.com/OlegYch")) ThisBuild / scmInfo := Some( ScmInfo( - url("https://github.com/OlegYch/scala-dzi"), - "scm:git@github.com:OlegYch/scala-dzi.git" + url("https://github.com/OlegYch/scaposer"), + "scm:git@github.com:OlegYch/scaposer.git" ) ) ThisBuild / developers := List( From 7552f5c43c1ccadddd96ae97bfaedd8ccce4c473 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:24:41 +0100 Subject: [PATCH 07/17] add developer --- build.sbt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4c8e07b..8ebc259 100644 --- a/build.sbt +++ b/build.sbt @@ -25,12 +25,18 @@ ThisBuild / scmInfo := Some( ) ) ThisBuild / developers := List( + Developer( + id = "ngocdaothanh", + name = "Ngoc Dao", + email = "ngocdaothanh@gmail.com", + url = url("https://github.com/ngocdaothanh") + ), Developer( id = "OlegYch", name = "Aleh Aleshka", email = "oleglbch@gmail.com", url = url("https://github.com/OlegYch") - ) + ), ) ThisBuild / description := "GNU Gettext .po file loader for Scala" From da8ed38912b372e00ea37d5f84114da2332e6eb4 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:25:32 +0100 Subject: [PATCH 08/17] Setting version to 1.12.1 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index b30e965..14136c2 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.1-SNAPSHOT" +ThisBuild / version := "1.12.1" From 6359d9b59bea80c653889fa5b7f17ec04e1b6be4 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:26:35 +0100 Subject: [PATCH 09/17] Setting version to 1.12.2-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 14136c2..0ac981d 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.1" +ThisBuild / version := "1.12.2-SNAPSHOT" From 35d5b2ac9131de14f90a0c88432c05b32a47607f Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:29:44 +0100 Subject: [PATCH 10/17] Setting version to 1.12.2 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 0ac981d..cb989cc 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.2-SNAPSHOT" +ThisBuild / version := "1.12.2" From 4c41c0df21b472f192d6662cfcf4a86a31915d05 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:31:17 +0100 Subject: [PATCH 11/17] Setting version to 1.12.3-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index cb989cc..be36302 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.2" +ThisBuild / version := "1.12.3-SNAPSHOT" From c0216594107e90f14ec92d183ba72e3d7dae3bf0 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:42:25 +0100 Subject: [PATCH 12/17] Setting version to 1.12.3 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index be36302..cc022c1 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.3-SNAPSHOT" +ThisBuild / version := "1.12.3" From bce3a1d1b45baf973f9c40684c2efed02d841d22 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:44:16 +0100 Subject: [PATCH 13/17] Setting version to 1.12.4-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index cc022c1..dc65936 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.3" +ThisBuild / version := "1.12.4-SNAPSHOT" From d6bf7d81c80ff5b3d82d9f6e4f513c3949ee2248 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:50:54 +0100 Subject: [PATCH 14/17] try to fix cross release --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8ebc259..6cf945a 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ releaseProcess := Seq[ReleaseStep]( setReleaseVersion, commitReleaseVersion, tagRelease, - releaseStepCommandAndRemaining("publishSigned"), + releaseStepCommandAndRemaining("+publishSigned"), releaseStepCommand("sonatypeBundleRelease"), setNextVersion, commitNextVersion, From c35697039cc9aee3a248c116e3445fb36360d883 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:51:35 +0100 Subject: [PATCH 15/17] Setting version to 1.12.4 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index dc65936..3a96a42 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.4-SNAPSHOT" +ThisBuild / version := "1.12.4" From 1010769c49ee751e38d06ce2340a807bdae3892a Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 4 Dec 2023 16:53:42 +0100 Subject: [PATCH 16/17] Setting version to 1.12.5-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 3a96a42..0260af5 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.12.4" +ThisBuild / version := "1.12.5-SNAPSHOT" From 63a6815293c23690b4758825570660c18b624fe3 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Mon, 18 Dec 2023 19:08:03 +0100 Subject: [PATCH 17/17] update docs --- CHANGELOG | 8 +++++++- README.rst | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 37e043e..e121cf4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ +1.12.4: https://github.com/xitrum-framework/scaposer/pull/26 + +* Support Scala 3, scala.js and scala-native +* Remove support for Scala 2.11 +* Update scala-parser-combinators to 2.3.0 + 1.11.1: https://github.com/xitrum-framework/scaposer/pull/22 -* Support Scala 12.3 +* Support Scala 2.13 * Update scala-parser-combinators from 1.1.1 to 1.1.2 1.11.0: diff --git a/README.rst b/README.rst index 8fcc454..e0750dd 100644 --- a/README.rst +++ b/README.rst @@ -118,6 +118,6 @@ build.sbt example: :: - libraryDependencies += "tv.cntt" %% "scaposer" % "1.12.0" + libraryDependencies += "tv.cntt" %% "scaposer" % "1.12.4" Scaposer is used in `Xitrum web framework `_.