Skip to content

Commit 3472b5e

Browse files
antonstamovmaxcom
authored andcommitted
Fix binary incompatibility issues with @unroll annotation
Fix formatting
1 parent 5086119 commit 3472b5e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package zio.http
1818

19+
import scala.annotation.unroll
20+
1921
import zio.Config
2022
import zio.Config.Secret
2123

@@ -36,6 +38,7 @@ final case class SSLConfig(
3638
provider: Provider,
3739
clientAuth: Option[ClientAuth] = None,
3840
includeClientCert: Boolean = false,
41+
@unroll
3942
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
4043
)
4144

@@ -69,6 +72,7 @@ object SSLConfig {
6972
clientAuth: Option[ClientAuth] = None,
7073
trustCertCollectionPath: Option[String] = None,
7174
includeClientCert: Boolean = false,
75+
@unroll
7276
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
7377
): SSLConfig =
7478
new SSLConfig(
@@ -93,6 +97,7 @@ object SSLConfig {
9397
clientAuth: Option[ClientAuth] = None,
9498
trustCertCollectionPath: Option[String] = None,
9599
includeClientCert: Boolean = false,
100+
@unroll
96101
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
97102
): SSLConfig =
98103
new SSLConfig(
@@ -112,6 +117,7 @@ object SSLConfig {
112117
trustManagerKeyStore: Option[Data.TrustManagerKeyStore] = None,
113118
clientAuth: Option[ClientAuth] = None,
114119
includeClientCert: Boolean = false,
120+
@unroll
115121
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
116122
): SSLConfig =
117123
new SSLConfig(
@@ -138,6 +144,7 @@ object SSLConfig {
138144
trustManagerKeyStore: Option[Data.TrustManagerKeyStore] = None,
139145
clientAuth: Option[ClientAuth] = None,
140146
includeClientCert: Boolean = false,
147+
@unroll
141148
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
142149
): SSLConfig = {
143150
fromJavaxNetSsl(
@@ -159,6 +166,7 @@ object SSLConfig {
159166
behaviour: HttpBehaviour = HttpBehaviour.Redirect,
160167
clientAuth: Option[ClientAuth] = None,
161168
includeClientCert: Boolean = false,
169+
@unroll
162170
protocols: Seq[String] = Seq("TLSv1.3", "TLSv1.2"),
163171
): SSLConfig =
164172
new SSLConfig(

0 commit comments

Comments
 (0)