From df7e5578bb97325402d1a0f688258a230ae372d9 Mon Sep 17 00:00:00 2001 From: Christopher Batey Date: Tue, 18 Jun 2019 15:21:26 +0100 Subject: [PATCH] Revert to 0.4.* of ssl config for 2.13 (#27152) We've released 2.5.23 for 2.13 with 0.4.0 but this changes the default behavior. This reverts that so the first release we are binary compat for 2.13 will be 2.5.24. For 2.6 we can still perhaps upgrade to 0.4.0 and document or override the new behavior. Refs #27142 --- project/Dependencies.scala | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0679446cf1..865b96159a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,7 +13,7 @@ object Dependencies { lazy val scalaTestVersion = settingKey[String]("The version of ScalaTest to use.") lazy val scalaCheckVersion = settingKey[String]("The version of ScalaCheck to use.") lazy val java8CompatVersion = settingKey[String]("The version of scala-java8-compat to use.") - lazy val sslConfigVersion = settingKey[String]("The version of ssl-config to use.") + val junitVersion = "4.12" val slf4jVersion = "1.7.25" val scalaXmlVersion = "1.0.6" @@ -27,6 +27,8 @@ object Dependencies { val scala212Version = "2.12.8" val scala213Version = "2.13.0" + val sslConfigVersion = "0.3.8" + val Versions = Seq( crossScalaVersions := Seq(scala212Version, scala213Version), scalaVersion := System.getProperty("akka.build.scalaVersion", crossScalaVersions.value.head), @@ -44,12 +46,6 @@ object Dependencies { case Some((2, n)) if n >= 13 => "0.9.0" case _ => "0.8.0" } - }, - sslConfigVersion := { - CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, n)) if n >= 13 => "0.4.0" - case _ => "0.3.7" - } }) object Compile { @@ -75,7 +71,7 @@ object Dependencies { val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.2" // CC0 // ssl-config - val sslConfigCore = Def.setting { "com.typesafe" %% "ssl-config-core" % sslConfigVersion.value } // ApacheV2 + val sslConfigCore = Def.setting { "com.typesafe" %% "ssl-config-core" % sslConfigVersion } // ApacheV2 val lmdb = "org.lmdbjava" % "lmdbjava" % "0.6.1" // ApacheV2, OpenLDAP Public License