From 3112e4ad063c2894c3d2e35fdb07cf184e6ffbf1 Mon Sep 17 00:00:00 2001 From: xhh Date: Tue, 1 Sep 2015 11:20:44 +0800 Subject: [PATCH] Add build files for Gradle and SBT --- .../codegen/languages/JavaClientCodegen.java | 8 ++++-- .../okhttp-gson/build.gradle.mustache | 28 +++++++++++++++++++ .../libraries/okhttp-gson/build.sbt.mustache | 18 ++++++++++++ .../petstore/java/okhttp-gson/build.gradle | 28 +++++++++++++++++++ .../petstore/java/okhttp-gson/build.sbt | 18 ++++++++++++ 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache create mode 100644 samples/client/petstore/java/okhttp-gson/build.gradle create mode 100644 samples/client/petstore/java/okhttp-gson/build.sbt diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index eab4dffa8e3..fa01d0e459f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -163,9 +163,13 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { // library-specific files if ("okhttp-gson".equals(getLibrary())) { - // the "okhttp-gson" library template requires "ApiCallback.mustache" - // and does not require "TypeRef.mustache" + // the "okhttp-gson" library template requires "ApiCallback.mustache" for async call supportingFiles.add(new SupportingFile("ApiCallback.mustache", invokerFolder, "ApiCallback.java")); + // "build.gradle" is for development with Gradle + supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle")); + // "build.sbt" is for development with SBT + supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt")); + // and does not require "TypeRef.mustache" } else { supportingFiles.add(new SupportingFile("TypeRef.mustache", invokerFolder, "TypeRef.java")); } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache new file mode 100644 index 00000000000..1113d8b4ee9 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -0,0 +1,28 @@ +apply plugin: 'java' +apply plugin: 'maven' + +repositories { + mavenCentral() +} + +dependencies { + compile 'io.swagger:swagger-annotations:1.5.0' + compile 'com.squareup.okhttp:okhttp:2.4.0' + compile 'com.google.code.gson:gson:2.3.1' + compile 'com.brsanthu:migbase64:2.2' + testCompile 'junit:junit:4.8.1' +} + +group = '{{groupId}}' +version = '{{artifactVersion}}' + +install { + repositories.mavenInstaller { + pom.artifactId = '{{artifactId}}' + } +} + +task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath +} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache new file mode 100644 index 00000000000..b748f53e48d --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache @@ -0,0 +1,18 @@ +lazy val root = (project in file(".")). + settings( + organization := "{{groupId}}", + name := "{{artifactId}}", + version := "{{artifactVersion}}", + scalaVersion := "2.11.4", + scalacOptions ++= Seq("-feature"), + javacOptions in compile ++= Seq("-Xlint:deprecation"), + publishArtifact in (Compile, packageDoc) := false, + resolvers += Resolver.mavenLocal, + libraryDependencies ++= Seq( + "io.swagger" % "swagger-annotations" % "1.5.0", + "com.squareup.okhttp" % "okhttp" % "2.4.0", + "com.google.code.gson" % "gson" % "2.3.1", + "com.brsanthu" % "migbase64" % "2.2", + "junit" % "junit" % "4.8.1" % "test" + ) + ) diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle new file mode 100644 index 00000000000..96c8f7718d3 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'java' +apply plugin: 'maven' + +repositories { + mavenCentral() +} + +dependencies { + compile 'io.swagger:swagger-annotations:1.5.0' + compile 'com.squareup.okhttp:okhttp:2.4.0' + compile 'com.google.code.gson:gson:2.3.1' + compile 'com.brsanthu:migbase64:2.2' + testCompile 'junit:junit:4.8.1' +} + +group = 'io.swagger' +version = '1.0.0' + +install { + repositories.mavenInstaller { + pom.artifactId = 'swagger-petstore-okhttp-gson' + } +} + +task execute(type:JavaExec) { + main = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath +} diff --git a/samples/client/petstore/java/okhttp-gson/build.sbt b/samples/client/petstore/java/okhttp-gson/build.sbt new file mode 100644 index 00000000000..f70c7ea41c7 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/build.sbt @@ -0,0 +1,18 @@ +lazy val root = (project in file(".")). + settings( + organization := "io.swagger", + name := "swagger-petstore-okhttp-gson", + version := "1.0.0", + scalaVersion := "2.11.4", + scalacOptions ++= Seq("-feature"), + javacOptions in compile ++= Seq("-Xlint:deprecation"), + publishArtifact in (Compile, packageDoc) := false, + resolvers += Resolver.mavenLocal, + libraryDependencies ++= Seq( + "io.swagger" % "swagger-annotations" % "1.5.0", + "com.squareup.okhttp" % "okhttp" % "2.4.0", + "com.google.code.gson" % "gson" % "2.3.1", + "com.brsanthu" % "migbase64" % "2.2", + "junit" % "junit" % "4.8.1" % "test" + ) + )