Skip to content

Commit 9dde852

Browse files
ramzimaalejwing328
authored andcommitted
[Akka-Scala] This is a fix to a bug introduced by this PR #7172 (#7228)
* Add missing import * Update petstore app
1 parent d6539ba commit 9dde852

File tree

9 files changed

+348
-329
lines changed

9 files changed

+348
-329
lines changed

modules/swagger-codegen/src/main/resources/akka-scala/apiInvoker.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import spray.httpx.encoding.{Deflate, Encoder, Gzip}
3333
import spray.httpx.unmarshalling._
3434
import spray.io.ClientSSLEngineProvider
3535

36-
import scala.concurrent.{ExecutionContext, Future}
36+
import scala.concurrent.{ExecutionContext, ExecutionContextExecutor, Future}
3737
import scala.reflect.ClassTag
3838
import scala.util.control.NonFatal
3939

samples/client/petstore/akka-scala/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Automatically generated by the [Swagger Codegen](https://github.com/swagger-api/
1010

1111
- API version: 1.0.0
1212
- Package version:
13-
- Build date: 2017-11-29T09:41:04.759-08:00
13+
- Build date: 2017-12-20T09:35:05.126-08:00
1414
- Build package: io.swagger.codegen.languages.AkkaScalaClientCodegen
1515

1616
# Requirements
Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
1-
version := "1.0.0"
2-
3-
name := "scala-akka-petstore-client"
4-
5-
organization := "io.swagger"
6-
7-
scalaVersion := "2.11.8"
1+
version := "1.0.0"
2+
name := "scala-akka-petstore-client"
3+
organization := "io.swagger"
4+
scalaVersion := "2.11.12"
85

96
libraryDependencies ++= Seq(
107
"io.swagger" % "swagger-core" % "1.5.15",
11-
"com.typesafe" % "config" % "1.2.1",
12-
"com.typesafe.akka" % "akka-actor_2.10" % "2.3.9",
8+
"com.typesafe" % "config" % "1.3.2",
9+
"com.typesafe.akka" %% "akka-actor" % "2.5.8",
1310
"io.spray" % "spray-client" % "1.3.1",
14-
"joda-time" % "joda-time" % "2.2",
15-
"org.joda" % "joda-convert" % "1.2",
16-
"org.json4s" % "json4s-jackson_2.10" % "3.2.11",
17-
"org.scalatest" %% "scalatest" % "2.2.4" % "test",
18-
"junit" % "junit" % "4.8.1" % "test"
11+
"joda-time" % "joda-time" % "2.9.9",
12+
"org.joda" % "joda-convert" % "1.9.2",
13+
"org.json4s" %% "json4s-jackson" % "3.5.3",
14+
"org.scalatest" %% "scalatest" % "3.0.4" % "test",
15+
"junit" % "junit" % "4.12" % "test"
1916
)
2017

21-
resolvers ++= Seq(
22-
Resolver.mavenLocal
23-
)
18+
resolvers ++= Seq(Resolver.mavenLocal)
2419

2520
scalacOptions := Seq(
2621
"-unchecked",
@@ -29,4 +24,3 @@ scalacOptions := Seq(
2924
)
3025

3126
publishArtifact in (Compile, packageDoc) := false
32-

0 commit comments

Comments
 (0)