Skip to content

Commit 44ebcd1

Browse files
authored
ssl-config-core 0.7.0 + upgrade Scala and sbt-scalafix (#1384)
* Latest Scala releases * Latest sbt-scalafix release * Upgrade ssl-config-core to latest 0.7.0 * Fix a test unrelated to this pull request
1 parent 23664e1 commit 44ebcd1

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

project/BuildSettings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ object BuildSettings {
1313

1414
private def isScala3(scalaVersion: String): Boolean = CrossVersion.partialVersion(scalaVersion).exists(_._1 == 3)
1515

16-
private val scala212 = "2.12.19"
17-
private val scala213 = "2.13.13"
16+
private val scala212 = "2.12.20"
17+
private val scala213 = "2.13.17"
1818
private val scala3 = "3.3.7"
1919

2020
lazy val common: Seq[Def.Setting[_]] = Seq(

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Dependencies {
4141
val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19"
4242
val sentry = "io.sentry" % "sentry" % "8.23.0"
4343
val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.17"
44-
val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.6.1"
44+
val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.7.0"
4545
val testContainersScalaScalaTest = "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.43.0"
4646
val testContainersScalaKafka = "com.dimafeng" %% "testcontainers-scala-kafka" % "0.43.0"
4747
val zio = "dev.zio" %% "zio" % "1.0.18"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
2-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
2+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.4")
33
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
44
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
55
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4")

pureconfig/src/test/scala-2/com/avast/sst/pureconfig/PureConfigModuleTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class PureConfigModuleTest extends AnyFunSuite {
2020
private val sourceWithTypeError = ConfigSource.string("""|number = wrong_type
2121
|string = "test"""".stripMargin)
2222

23-
private case class TestConfig(number: Int, string: String)
23+
final private case class TestConfig(number: Int, string: String)
2424

2525
implicit private val configReader: ConfigReader[TestConfig] = deriveReader[TestConfig]
2626

ssl-config/src/test/scala/com/avast/sst/ssl/SslContextModuleTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class SslContextModuleTest extends AnyFunSuite {
88

99
test("SslContextModule initializes properly from JKS store with reference config") {
1010
val sslContext = SslContextModule.make[SyncIO](ConfigFactory.empty()).unsafeRunSync()
11-
assert(sslContext.getProtocol === "TLSv1.2")
11+
assert(sslContext.getProtocol === "TLSv1.3")
1212
}
1313

1414
test("SslContextModule initializes properly from JKS store with provided config") {
1515
val sslContext = SslContextModule.make[SyncIO](ConfigFactory.load().getConfig("ssl-config"), withReference = false).unsafeRunSync()
16-
assert(sslContext.getProtocol === "TLSv1.2")
16+
assert(sslContext.getProtocol === "TLSv1.3")
1717
}
1818

1919
test("SslContextModule fails to initialize for empty config and no reference config") {

0 commit comments

Comments
 (0)