Merge 915eb97 into 3954d8d

mohiva · Jan 9, 2018 · 390dd6d · 390dd6d
2 parents 3954d8d + 915eb97
commit 390dd6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/codegen/src/main/java/io/swagger/codegen/languages/PlayScalaClientCodegen.java b/codegen/src/main/java/io/swagger/codegen/languages/PlayScalaClientCodegen.java
@@ -343,17 +343,6 @@ public List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition>
         return codegenSecurities;
     }
 
-    private String formatIdentifier(String name, boolean capitalized) {
-        String identifier = camelize(sanitizeName(name), true);
-        if (capitalized) {
-            identifier = StringUtils.capitalize(identifier);
-        }
-        if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !isReservedWord(identifier)) {
-            return identifier;
-        }
-        return escapeReservedWord(identifier);
-    }
-
     private static abstract class CustomLambda implements Mustache.Lambda {
         @Override
         public void execute(Template.Fragment frag, Writer out) throws IOException {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -18,7 +18,7 @@ import sbt._
 object Dependencies {
 
   object Versions {
-    val crossScala = Seq("2.12.3", "2.11.11")
+    val crossScala = Seq("2.12.4", "2.11.12")
     val scalaVersion = crossScala.head
   }
 
@@ -30,9 +30,9 @@ object Dependencies {
   object Library {
 
     object Play {
-      val version = "2.6.6"
+      val version = "2.6.10"
       val ws = "com.typesafe.play" %% "play-ahc-ws" % version
-      val json = "com.typesafe.play" %% "play-json" % version
+      val json = "com.typesafe.play" %% "play-json" % "2.6.8"
       val test = "com.typesafe.play" %% "play-test" % version
       val specs2 = "com.typesafe.play" %% "play-specs2" % version
       object Specs2 {
@@ -44,7 +44,7 @@ object Dependencies {
 
     val playJsonExtension = "ai.x" %% "play-json-extensions" % "0.10.0"
     val playWSMock = "de.leanovate.play-mockws" %% "play-mockws" % "2.6.2"
-    val swaggerCodegen = "io.swagger" % "swagger-codegen" % "2.2.3"
+    val swaggerCodegen = "io.swagger" % "swagger-codegen" % "2.3.0"
     val javaxInject = "javax.inject" % "javax.inject" % "1"
     val testNG = "org.testng" % "testng" % "6.8"
   }