Skip to content

Commit a7fd237

Browse files
committed
Fix binary incompatibility issues with @unroll annotation
1 parent e51eb4e commit a7fd237

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

project/MimaSettings.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@ object MimaSettings {
4343
ProblemFilters.exclude[MissingClassProblem]("zio.http.netty.NettyHeaderEncoding"),
4444
ProblemFilters.exclude[MissingClassProblem]("zio.http.netty.NettyHeaderEncoding$"),
4545
exclude[Problem]("zio.http.template2.*"),
46-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.apply"),
47-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.copy"),
48-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.this"),
49-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.fromJavaxNetSsl"),
50-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.fromJavaxNetSslKeyStoreResource"),
51-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.fromJavaxNetSslKeyStoreFile"),
52-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.fromResource"),
53-
ProblemFilters.exclude[DirectMissingMethodProblem]("zio.http.SSLConfig.fromFile"),
5446
),
5547
mimaFailOnProblem := failOnProblem,
5648
)

zio-http/shared/src/main/scala/zio/http/SSLConfig.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package zio.http
1818

1919
import zio.Config
2020
import zio.Config.Secret
21+
import scala.annotation.unroll
2122

2223
import zio.http.SSLConfig._
2324

@@ -36,7 +37,7 @@ final case class SSLConfig(
3637
provider: Provider,
3738
clientAuth: Option[ClientAuth] = None,
3839
includeClientCert: Boolean = false,
39-
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
40+
@unroll protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
4041
)
4142

4243
object SSLConfig {
@@ -69,7 +70,7 @@ object SSLConfig {
6970
clientAuth: Option[ClientAuth] = None,
7071
trustCertCollectionPath: Option[String] = None,
7172
includeClientCert: Boolean = false,
72-
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
73+
@unroll protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
7374
): SSLConfig =
7475
new SSLConfig(
7576
behaviour,
@@ -93,7 +94,7 @@ object SSLConfig {
9394
clientAuth: Option[ClientAuth] = None,
9495
trustCertCollectionPath: Option[String] = None,
9596
includeClientCert: Boolean = false,
96-
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
97+
@unroll protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
9798
): SSLConfig =
9899
new SSLConfig(
99100
behaviour,
@@ -112,7 +113,7 @@ object SSLConfig {
112113
trustManagerKeyStore: Option[Data.TrustManagerKeyStore] = None,
113114
clientAuth: Option[ClientAuth] = None,
114115
includeClientCert: Boolean = false,
115-
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
116+
@unroll protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
116117
): SSLConfig =
117118
new SSLConfig(
118119
behaviour,
@@ -138,7 +139,7 @@ object SSLConfig {
138139
trustManagerKeyStore: Option[Data.TrustManagerKeyStore] = None,
139140
clientAuth: Option[ClientAuth] = None,
140141
includeClientCert: Boolean = false,
141-
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
142+
@unroll protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
142143
): SSLConfig = {
143144
fromJavaxNetSsl(
144145
Data.FromJavaxNetSsl(
@@ -159,7 +160,7 @@ object SSLConfig {
159160
behaviour: HttpBehaviour = HttpBehaviour.Redirect,
160161
clientAuth: Option[ClientAuth] = None,
161162
includeClientCert: Boolean = false,
162-
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
163+
@unroll protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
163164
): SSLConfig =
164165
new SSLConfig(
165166
behaviour,

0 commit comments

Comments
 (0)