Skip to content

Commit e08095e

Browse files
fix: use https to query petstore in scala-akka to avoid redirect
1 parent a6e5b90 commit e08095e

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

samples/client/petstore/scala-akka/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version := "1.0.0"
22
name := "scala-akka-petstore-client"
33
organization := "org.openapitools"
44

5-
scalaVersion := "2.12.13"
5+
scalaVersion := "2.13.13"
66
crossScalaVersions := Seq(scalaVersion.value, "2.13.4")
77

88

@@ -14,7 +14,7 @@ libraryDependencies ++= Seq(
1414
"org.json4s" %% "json4s-jackson" % "4.0.7",
1515
"org.json4s" %% "json4s-ext" % "4.0.7",
1616
"de.heikoseeberger" %% "akka-http-json4s" % "1.39.2",
17-
"org.scala-lang.modules" %% "scala-collection-compat" % "2.4.1",
17+
"org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0",
1818
// test dependencies
1919
"org.scalatest" %% "scalatest" % "3.2.3" % "test",
2020
"org.scalatestplus" %% "junit-5-10" % "3.2.18.0" % "test"

samples/client/petstore/scala-akka/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1616

1717
<java.version>11</java.version>
18-
<scala.version>2.12.13</scala.version>
18+
<scala.version>2.13.13</scala.version>
1919
<json4s.jackson.version>4.0.7</json4s.jackson.version>
2020
<json4s.ext.version>4.0.7</json4s.ext.version>
2121
<akka.version>2.8.5</akka.version>
@@ -43,50 +43,50 @@
4343
</dependency>
4444
<dependency>
4545
<groupId>com.typesafe.akka</groupId>
46-
<artifactId>akka-actor_2.12</artifactId>
46+
<artifactId>akka-actor_2.13</artifactId>
4747
<version>${akka.version}</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>com.typesafe.akka</groupId>
51-
<artifactId>akka-stream_2.12</artifactId>
51+
<artifactId>akka-stream_2.13</artifactId>
5252
<version>${akka.version}</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>com.typesafe.akka</groupId>
56-
<artifactId>akka-http_2.12</artifactId>
56+
<artifactId>akka-http_2.13</artifactId>
5757
<version>${akka.http.version}</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.json4s</groupId>
61-
<artifactId>json4s-jackson_2.12</artifactId>
61+
<artifactId>json4s-jackson_2.13</artifactId>
6262
<version>${json4s.jackson.version}</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.json4s</groupId>
66-
<artifactId>json4s-ext_2.12</artifactId>
66+
<artifactId>json4s-ext_2.13</artifactId>
6767
<version>${json4s.jackson.version}</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>de.heikoseeberger</groupId>
71-
<artifactId>akka-http-json4s_2.12</artifactId>
71+
<artifactId>akka-http-json4s_2.13</artifactId>
7272
<version>${akka.http.json4s.version}</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>org.scala-lang.modules</groupId>
76-
<artifactId>scala-collection-compat_2.12</artifactId>
76+
<artifactId>scala-collection-compat_2.13</artifactId>
7777
<version>${scala.compat.version}</version>
7878
</dependency>
7979

8080
<!--test dependencies-->
8181
<dependency>
8282
<groupId>org.scalatest</groupId>
83-
<artifactId>scalatest_2.12</artifactId>
83+
<artifactId>scalatest_2.13</artifactId>
8484
<version>${scala.test.version}</version>
8585
<scope>test</scope>
8686
</dependency>
8787
<dependency>
8888
<groupId>org.scalatestplus</groupId>
89-
<artifactId>junit-5-10_2.12</artifactId>
89+
<artifactId>junit-5-10_2.13</artifactId>
9090
<version>${scala.test.plus.version}</version>
9191
<scope>test</scope>
9292
</dependency>

samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/PetApi.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.openapitools.client.core.ApiKeyLocations._
2020

2121
object PetApi {
2222

23-
def apply(baseUrl: String = "http://petstore.swagger.io/v2") = new PetApi(baseUrl)
23+
def apply(baseUrl: String = "https://petstore.swagger.io/v2") = new PetApi(baseUrl)
2424
}
2525

2626
class PetApi(baseUrl: String) {

0 commit comments

Comments
 (0)