Merge branch 'master' into streaming

# Conflicts:
#	build.sbt
#	project/plugins.sbt

Author: ddworak

.github/workflows/ci.yml

@@ -52,20 +52,10 @@ jobs:
       - name: Get version
         id: get_tag_name
         run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-      - name: Import GPG key
-        env:
-          #exported via `gpg -a --export-secret-keys <key> | cat -e | sed 's/\$/\\n/g' | xclip -selection clipboard` and added to org secrets
-          SONATYPE_GPG: ${{ secrets.SONATYPE_GPG }}
-        run: echo -e $SONATYPE_GPG | gpg --import -
       - name: Publish artifacts
         env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-        run: sbt 'set ThisBuild/version := "${{ steps.get_tag_name.outputs.VERSION }}"' +publishSigned
-      - name: Release Sonatype bundle
-        #https://github.com/xerial/sbt-sonatype#publishing-your-artifact
-        if: ${{ !endsWith(steps.get_tag_name.outputs.VERSION, 'SNAPSHOT') }}
-        env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-        run: sbt 'set ThisBuild/version := "${{ steps.get_tag_name.outputs.VERSION }}"' sonatypeBundleRelease
+        run: sbt ci-release

.scala-steward.conf

@@ -4,3 +4,10 @@ updates.ignore = [
 updates.pin = [
   {groupId = "ch.qos.logback", version = "1.3."},
 ]
+pullRequests.grouping = [
+  {
+    name = "jetty",
+    title = "Update Jetty dependencies",
+    filter = [{ group = "org.eclipse.jetty" }, { group = "org.eclipse.jetty*" }]
+  }
+]

build.sbt

@@ -10,9 +10,18 @@ name := "udash"
 Global / excludeLintKeys ++= Set(ideOutputDirectory, ideSkipProject)
 
 inThisBuild(Seq(
-  version := "0.18.0-SNAPSHOT",
   organization := "io.udash",
   resolvers += Resolver.defaultLocal,
+  homepage := Some(url("https://udash.io")),
+  licenses := Seq(License.Apache2),
+  scmInfo := Some(ScmInfo(
+    browseUrl = url("https://github.com/UdashFramework/udash-core"),
+    connection = "scm:git:[email protected]:UdashFramework/udash-core.git",
+    devConnection = Some("scm:git:[email protected]:UdashFramework/udash-core.git"),
+  )),
+  developers := List(
+    Developer("ddworak", "Dawid Dworak", "[email protected]", url("https://github.com/ddworak")),
+  ),
 ))
 
 val forIdeaImport = System.getProperty("idea.managed", "false").toBoolean && System.getProperty("idea.runid") == null
@@ -24,39 +33,6 @@ val browserCapabilities: Capabilities = {
   new FirefoxOptions().setHeadless(true).setLogLevel(FirefoxDriverLogLevel.WARN)
 }
 
-// Deployment configuration
-val deploymentConfiguration = Seq(
-  publishMavenStyle := true,
-  Test / publishArtifact := false,
-  pomIncludeRepository := { _ => false },
-
-  publishTo := sonatypePublishToBundle.value,
-
-  credentials in Global += Credentials(
-    "Sonatype Nexus Repository Manager",
-    "oss.sonatype.org",
-    sys.env.getOrElse("SONATYPE_USERNAME", ""),
-    sys.env.getOrElse("SONATYPE_PASSWORD", "")
-  ),
-
-  licenses := Seq(License.Apache2),
-
-  pomExtra := {
-    <url>https://github.com/UdashFramework/udash-core</url>
-      <scm>
-        <url>git@github.com:UdashFramework/udash-core.git</url>
-        <connection>scm:git@github.com:UdashFramework/udash-core.git</connection>
-      </scm>
-      <developers>
-        <developer>
-          <id>avsystem</id>
-          <name>AVSystem</name>
-          <url>http://www.avsystem.com/</url>
-        </developer>
-      </developers>
-  }
-)
-
 val commonSettings = Seq(
   scalaVersion := Dependencies.versionOfScala,
   crossScalaVersions := Seq(Dependencies.versionOfScala),
@@ -86,7 +62,8 @@ val commonSettings = Seq(
   Test / ideOutputDirectory := Some(target.value.getParentFile / "out/test"),
   libraryDependencies ++= Dependencies.compilerPlugins.value,
   libraryDependencies ++= Dependencies.commonTestDeps.value,
-) ++ deploymentConfiguration
+  pomIncludeRepository := { _ => false },
+)
 
 val commonJsSettings = commonSettings ++ Seq(
   Test / scalaJSStage := FastOptStage,

project/Dependencies.scala

@@ -14,21 +14,21 @@ object Dependencies {
   val scalaCssVersion = "1.0.0"
 
   val servletVersion = "4.0.1"
-  val avsCommonsVersion = "2.21.0"
+  val avsCommonsVersion = "2.22.0"
 
   val atmosphereJSVersion = "3.1.3"
   val atmosphereVersion = "2.7.15"
 
-  val upickleVersion = "4.1.0" // Tests only
-  val circeVersion = "0.14.10" // Tests only
+  val upickleVersion = "4.2.1" // Tests only
+  val circeVersion = "0.14.13" // Tests only
   val circeDerivationVersion = "0.13.0-M5" // Tests only
   val monixVersion = "3.4.1" // udash-rest only
 
-  val sttpVersion = "3.10.3"
+  val sttpVersion = "3.11.0"
 
   val scalaLoggingVersion = "3.9.5"
 
-  val jettyVersion = "12.0.16"
+  val jettyVersion = "12.0.22"
   val typesafeConfigVersion = "1.4.3"
   val flexmarkVersion = "0.64.8"
   val logbackVersion = "1.3.15"
@@ -43,8 +43,8 @@ object Dependencies {
   val bootstrap4DatepickerVersion = "5.39.0"
   val momentJsVersion = "2.30.1"
 
-  val seleniumVersion = "4.29.0"
-  val webDriverManagerVersion = "5.9.3"
+  val seleniumVersion = "4.33.0"
+  val webDriverManagerVersion = "6.1.0"
   val scalaJsBenchmarkVersion = "0.10.0"
 
   val compilerPlugins = Def.setting(Seq(

project/build.properties

@@ -1,2 +1,2 @@
 # suppress inspection "UnusedProperty"
-sbt.version=1.10.7
+sbt.version=1.11.2

project/plugins.sbt

@@ -3,14 +3,11 @@ logLevel := Level.Warn
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
 libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
 addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.2")
 addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
-
-// Deployment configuration
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")