From a656ea301e90d7819f03ccef9554d98e40be68de Mon Sep 17 00:00:00 2001 From: Ivan Porto Carrero Date: Tue, 21 Oct 2014 10:59:35 -0700 Subject: [PATCH] updates the codegen to also include the project name for sbt --- specs/extra.sbt | 31 +++++++++++++++++++ .../codegen/ScalaAsyncClientGenerator.scala | 21 +++++-------- 2 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 specs/extra.sbt diff --git a/specs/extra.sbt b/specs/extra.sbt new file mode 100644 index 00000000000..92613014ed1 --- /dev/null +++ b/specs/extra.sbt @@ -0,0 +1,31 @@ +val wordnikSnapshots = "Wordnik Snapshots" at "https://ci.aws.wordnik.com/artifactory/m2-snapshots/" + +val wordnikReleases = "Wordnik Releases" at "https://ci.aws.wordnik.com/artifactory/m2-releases/" + +val wordnikRemoteRepos = "Wordnik Remote Repos" at "https://ci.aws.wordnik.com/artifactory/remote-repos/" + +scalaVersion := "2.11.2" + +crossScalaVersions := Seq("2.10.4", "2.11.2") + +scalacOptions ++= Seq("-unchecked", "-deprecation", "-optimize", "-Xcheckinit", "-encoding", "utf8") + +version := "1.6.1" + +publishTo <<= (version) { version: String => + val artifactory = "https://ci.aws.wordnik.com/artifactory/m2-" + if (version.trim.endsWith("SNAPSHOT")) + Some("snapshots" at artifactory + "snapshots") + else + Some("releases" at artifactory + "releases") +} + +publishMavenStyle := true + +publishArtifact in Test := false + +pomIncludeRepository := { x => false } + +credentials += Credentials("Artifactory Realm", "ci.aws.wordnik.com", "mavenuser", "DEEaffe987a") + +resolvers ++= Seq(wordnikSnapshots, wordnikReleases, wordnikRemoteRepos) \ No newline at end of file diff --git a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala index c41245ad68d..ea0d3395129 100644 --- a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala +++ b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala @@ -1,20 +1,14 @@ package com.wordnik.swagger.codegen -import scala.collection.mutable -import java.io.{File, FileWriter} +import java.io.File + +import com.wordnik.swagger.codegen.language.CodegenConfig import com.wordnik.swagger.codegen.model._ -import scala.collection.mutable.{HashMap, ListBuffer} -import language.CodegenConfig -import scala.io.Source -import org.json4s.jackson.Serialization._ -import org.fusesource.scalate.{Template, TemplateSource, TemplateEngine} -import org.apache.commons.io.FileUtils -import com.wordnik.swagger.codegen.util.{CoreUtils, ApiExtractor, ResourceExtractor} -import com.wordnik.swagger.codegen.spec.SwaggerSpecValidator import mojolly.inflector.InflectorImports._ -import org.rogach.scallop.{ScallopConf, Scallop} -import scala.annotation.switch +import org.rogach.scallop.ScallopConf + import scala.collection.JavaConverters._ +import scala.collection.mutable.HashMap case class SwaggerApi( clientName: String, @@ -119,7 +113,8 @@ object ScalaAsyncClientGenerator extends App { props += "fileMap" -> resUrl props += "clientName" -> cfg.api.clientName.underscore.pascalize - + props += "projectName" -> cfg.api.clientName.underscore.dasherize + clientOpts.properties = props.toMap.asJava println(appBanner)