From 7df07fd66ed47d59e775a1c74ef25a58020af99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cardoso?= Date: Fri, 4 Jul 2025 16:57:23 +0100 Subject: [PATCH 1/5] Move some definitions around so that release works from the root --- build.sbt | 72 +++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/build.sbt b/build.sbt index eadb7df..b9828ad 100644 --- a/build.sbt +++ b/build.sbt @@ -59,33 +59,45 @@ lazy val lib = project Compile / unmanagedResources / includeFilter := "regexes.yaml", Test / unmanagedResourceDirectories += (ThisBuild / baseDirectory).value / "core", Test / unmanagedResources / includeFilter := "*.yaml", - - // Publishing - publishMavenStyle := true, - publishTo := { + Test / publishArtifact := false, + publishMavenStyle := true, + publishTo := { val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/" if (isSnapshot.value) Some("central-snapshots" at centralSnapshots) else localStaging.value - }, - Test / publishArtifact := false, - releaseCrossBuild := true, - releaseTagComment := s"Release ${(ThisBuild / version).value}", - releaseCommitMessage := s"Set version to ${(ThisBuild / version).value}", - releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - runClean, - runTest, - setReleaseVersion, - commitReleaseVersion, - tagRelease, - releaseStepCommandAndRemaining("+publishSigned"), - releaseStepCommand("sonaRelease"), - setNextVersion, - commitNextVersion, - pushChanges - ), - pomExtra := (https://github.com/ua-parser/uap-scala + } + ) + +lazy val benchmark = project + .in(file("modules/benchmark")) + .settings(commonSettings *) + .dependsOn(lib) + .enablePlugins(JmhPlugin) + .settings( + name := "uap-scala-benchmark", + Jmh / run / mainClass := Some("org.uaparser.scala.benchmark.Main"), + publish / skip := true + ) + +// Publishing settings +releaseCrossBuild := true +releaseTagComment := s"Release ${(ThisBuild / version).value}" +releaseCommitMessage := s"Set version to ${(ThisBuild / version).value}" +releaseProcess := Seq[ReleaseStep]( + checkSnapshotDependencies, + inquireVersions, + runClean, + runTest, + setReleaseVersion, + commitReleaseVersion, + tagRelease, + releaseStepCommandAndRemaining("+publishSigned"), + releaseStepCommand("sonaRelease"), + setNextVersion, + commitNextVersion, + pushChanges +) +ThisBuild / pomExtra := (https://github.com/ua-parser/uap-scala WTFPL @@ -119,18 +131,6 @@ lazy val lib = project https://twitter.com/phuc89 ) - ) - -lazy val benchmark = project - .in(file("modules/benchmark")) - .settings(commonSettings *) - .dependsOn(lib) - .enablePlugins(JmhPlugin) - .settings( - name := "uap-scala-benchmark", - Jmh / run / mainClass := Some("org.uaparser.scala.benchmark.Main"), - publish / skip := true - ) // do not cross build or publish the aggregating root crossScalaVersions := Nil From 6662d7e90e85e582082f420574a236ff6fa81ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cardoso?= Date: Fri, 4 Jul 2025 17:11:49 +0100 Subject: [PATCH 2/5] Use yaml instantiation per example --- .../src/test/scala/org/uaparser/scala/ParserSpecBase.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lib/src/test/scala/org/uaparser/scala/ParserSpecBase.scala b/modules/lib/src/test/scala/org/uaparser/scala/ParserSpecBase.scala index 11acba0..64a1b70 100644 --- a/modules/lib/src/test/scala/org/uaparser/scala/ParserSpecBase.scala +++ b/modules/lib/src/test/scala/org/uaparser/scala/ParserSpecBase.scala @@ -12,7 +12,7 @@ trait ParserSpecBase extends Specification { def createFromStream(stream: InputStream): UserAgentStringParser "Parser should" >> { - val yaml = { + def yaml() = { val maxFileSizeBytes = 5 * 1024 * 1024 // 5 MB val loaderOptions = new LoaderOptions() loaderOptions.setCodePointLimit(maxFileSizeBytes) @@ -21,7 +21,7 @@ trait ParserSpecBase extends Specification { def readCasesConfig(resource: String): List[Map[String, String]] = { val stream = this.getClass.getResourceAsStream(resource) - val cases = YamlUtil.loadYamlAsMap(stream, yaml) + val cases = YamlUtil.loadYamlAsMap(stream, yaml()) cases.getOrElse("test_cases", List()).filterNot(_.contains("js_ua")).map { config => config.filterNot { case (_, value) => value eq null } From 8eb594ba72aa25fb73488022408fb740924d7e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cardoso?= Date: Fri, 4 Jul 2025 17:28:41 +0100 Subject: [PATCH 3/5] Set version to 0.20.0 --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 56ec8ab..02dd9d0 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.19.1-SNAPSHOT" +ThisBuild / version := "0.20.0" From b8278682499d3d2cd30a592ecb6a4e1952b2e4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cardoso?= Date: Fri, 4 Jul 2025 17:38:57 +0100 Subject: [PATCH 4/5] Setting version to 0.20.1-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 02dd9d0..f4b544f 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.20.0" +ThisBuild / version := "0.20.1-SNAPSHOT" From 25cc3655dfb6fdfd96cc9f92e9893db3bdc36184 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 6 Jul 2025 21:53:31 +0000 Subject: [PATCH 5/5] Update sbt, scripted-plugin to 1.11.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bbb0b60..c02c575 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.2 +sbt.version=1.11.3 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy