Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@abrighton
abrighton committed Nov 27, 2023
1 parent b679ab1 commit 9d040d8
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Pekko-Scala-3-Upgrade-Notes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

* Replaced akka dependencies with pekko dependencies:
- Used these sbt resolvers:
```java
```
resolvers += "Apache Pekko Staging".at("https://repository.apache.org/content/groups/staging"),
resolvers += "jitpack" at "https://jitpack.io",
```
Expand Down
4 changes: 2 additions & 2 deletions jitpack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ before_install:
- chmod +x coursier
- ./coursier java --jvm temurin:1.17
- export JITPACK_VERSION=$VERSION
- wget https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.9.3/sbt-launch-1.9.3.jar
- wget https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/1.9.7/sbt-launch-1.9.7.jar
install:
- eval $(./coursier java --jvm temurin:1.17 --env)
- java -Xms2048m -Xmx2048m -XX:ReservedCodeCacheSize=512m -jar sbt-launch-1.9.3.jar -Dsbt.log.noformat=true clean publishM2
- java -Xms2048m -Xmx2048m -XX:ReservedCodeCacheSize=512m -jar sbt-launch-1.9.7.jar -Dsbt.log.noformat=true clean publishM2
54 changes: 25 additions & 29 deletions project/Libs.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,35 @@ import sbt.Def.{setting => dep}
import sbt._

object Libs {
// val ScalaVersion = "3.3.1-RC5"
val ScalaVersion = "3.3.0"
val ScalaVersion = "3.3.1"

val `dotty-cps-async` = dep("com.github.rssh" %%% "dotty-cps-async" % "0.9.18")
val `dotty-cps-async` = dep("com.github.rssh" %%% "dotty-cps-async" % "0.9.19")

val `scopt` = "com.github.scopt" %% "scopt" % "4.1.0" // MIT License
val `mockito` = "org.scalatestplus" %% "mockito-3-4" % "3.2.10.0"

// Dual license: Either, Eclipse Public License v1.0 or GNU Lesser General Public License version 2.1
val `logback-classic` = "ch.qos.logback" % "logback-classic" % "1.4.7"
val `logback-classic` = "ch.qos.logback" % "logback-classic" % "1.4.12"

val `sourcecode` = "com.lihaoyi" %% "sourcecode" % "0.3.0"
val `embedded-keycloak` = "com.github.tmtsoftware.embedded-keycloak" %% "embedded-keycloak" % "b339ef1" // Apache 2.0
val `embedded-keycloak` = "com.github.tmtsoftware.embedded-keycloak" %% "embedded-keycloak" % "6a111cd" // Apache 2.0
val `pekko-management` = "org.apache.pekko" %% "pekko-management" % "1.0.0"
val `svnkit` = "org.tmatesoft.svnkit" % "svnkit" % "1.10.11" // TMate Open Source License
val `commons-codec` = "commons-codec" % "commons-codec" % "1.15" // Apache 2.0š
val `gson` = "com.google.code.gson" % "gson" % "2.10.1" // Apache 2.0
val `play-json` = "com.typesafe.play" %% "play-json" % "2.10.0-RC9" // Apache 2.0
val `play-json` = "com.typesafe.play" %% "play-json" % "2.10.3" // Apache 2.0

val `enumeratum` = dep("com.beachape" %%% "enumeratum" % "1.7.3") // MIT License
val `scala-java-time` = dep("io.github.cquiroz" %%% "scala-java-time" % "2.5.0")
val `scalajs-java-securerandom` = dep("org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0")
val `scalatest` = dep("org.scalatest" %%% "scalatest" % "3.2.16") // Apache License 2.0
val `scalatest` = dep("org.scalatest" %%% "scalatest" % "3.2.17") // Apache License 2.0

val `jwt-core` = "com.github.jwt-scala" %% "jwt-core" % "9.4.3"
val `lettuce` = "io.lettuce" % "lettuce-core" % "6.2.6.RELEASE"
val `reactor-core` = "io.projectreactor" % "reactor-core" % "3.5.9"
val `jwt-core` = "com.github.jwt-scala" %% "jwt-core" % "9.4.5"
val `lettuce` = "io.lettuce" % "lettuce-core" % "6.3.0.RELEASE"
val `reactor-core` = "io.projectreactor" % "reactor-core" % "3.6.0"
val `reactive-streams` = "org.reactivestreams" % "reactive-streams" % "1.0.4"
val `pekko-connectors-kafka` = "org.apache.pekko" %% "pekko-connectors-kafka" % "1.0.0"
val `embedded-kafka` = "io.github.embeddedkafka" %% "embedded-kafka" % "3.5.1"
val `embedded-kafka` = "io.github.embeddedkafka" %% "embedded-kafka" % "3.6.0"
val `embedded-redis` = "com.github.kstyrc" % "embedded-redis" % "0.6"
val `scala-compiler` = "org.scala-lang" % "scala-compiler" % ScalaVersion
val `HdrHistogram` = "org.hdrhistogram" % "HdrHistogram" % "2.1.12"
Expand All @@ -44,23 +43,22 @@ object Libs {
val `json-schema-validator` = "com.github.fge" % "json-schema-validator" % "2.2.14" // LGPL/ASL

val `jna` = "net.java.dev.jna" % "jna" % "5.13.0"
val `postgresql` = "org.postgresql" % "postgresql" % "42.6.0"
val `hikaricp` = "com.zaxxer" % "HikariCP" % "5.0.1" // Apache License 2.0
val `io.zonky.test` = "io.zonky.test" % "embedded-postgres" % "2.0.4"
val `postgresql` = "org.postgresql" % "postgresql" % "42.7.0"
val `hikaricp` = "com.zaxxer" % "HikariCP" % "5.1.0" // Apache License 2.0
val `io.zonky.test` = "io.zonky.test" % "embedded-postgres" % "2.0.5"
// val httpclient = "org.apache.httpcomponents" % "httpclient" % "4.5.14"
val httpclient5 = "org.apache.httpcomponents.client5" % "httpclient5" % "5.2.1"
val httpclient5 = "org.apache.httpcomponents.client5" % "httpclient5" % "5.2.2"
val `jboss-logging` = "org.jboss.logging" % "jboss-logging" % "3.5.3.Final"
val `config` = "com.typesafe" % "config" % "1.4.2"
val `os-lib` = "com.lihaoyi" %% "os-lib" % "0.9.1"
val `caffeine` = "com.github.ben-manes.caffeine" % "caffeine" % "3.1.7"
val netty = "io.netty" % "netty-all" % "4.1.95.Final"
val `case-app` = "com.github.alexarchambault" %% "case-app" % "2.1.0-M25"
val `tmt-test-reporter` = "com.github.tmtsoftware.rtm" %% "rtm" % "f922171"
val `config` = "com.typesafe" % "config" % "1.4.3"
val `os-lib` = "com.lihaoyi" %% "os-lib" % "0.9.2"
val `caffeine` = "com.github.ben-manes.caffeine" % "caffeine" % "3.1.8"
val netty = "io.netty" % "netty-all" % "4.1.101.Final"
val `case-app` = "com.github.alexarchambault" %% "case-app" % "2.1.0-M26"
val `tmt-test-reporter` = "com.github.tmtsoftware.rtm" %% "rtm" % "23c1000"
}

object Borer {
val Version = "1.11.0"
// val Version = "961eeed"
val Version = "1.12.0"
val Org = "io.bullet"
// val Org = "com.github.tmtsoftware.borer"

Expand All @@ -70,7 +68,7 @@ object Borer {
}

object Jackson {
val Version = "2.15.2"
val Version = "2.16.0"

val `jackson-core` = "com.fasterxml.jackson.core" % "jackson-core" % Version
val `jackson-databind` = "com.fasterxml.jackson.core" % "jackson-databind" % Version
Expand Down Expand Up @@ -111,8 +109,7 @@ object PekkoHttp {
}

object Keycloak {
val Version = "22.0.1"
// val Version = "16.1.0"
val Version = "23.0.0"

val `keycloak-adapter-core` = "org.keycloak" % "keycloak-adapter-core" % Version
val `keycloak-core` = "org.keycloak" % "keycloak-core" % Version
Expand All @@ -122,16 +119,15 @@ object Keycloak {
}

object Jooq {
val Version = "3.18.6"
val Version = "3.18.7"

val `jooq` = "org.jooq" % "jooq" % Version
val `jooq-meta` = "org.jooq" % "jooq-meta" % Version
val `jooq-codegen` = "org.jooq" % "jooq-codegen" % Version
}

object MSocket {
// val Version = "0.6.0"
val Version = "49741dd"
val Version = "e205834"

val `msocket-api` = dep("com.github.tmtsoftware.msocket" %%% "msocket-api" % Version)
val `msocket-security` = "com.github.tmtsoftware.msocket" %% "msocket-security" % Version
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.3
sbt.version=1.9.7
8 changes: 4 additions & 4 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
//addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") // not scala 3 ready
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("com.orrsella" % "sbt-stats" % "1.0.7")
addSbtPlugin("de.johoop" % "sbt-testng-plugin" % "3.1.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")
addSbtPlugin("com.timushev.sbt" % "sbt-rewarn" % "0.1.3")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
Expand Down

0 comments on commit 9d040d8

Please sign in to comment.