Merge branch 'master' into java-datetime-format

modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {

modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {

modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {

samples/client/petstore/java/default/build.gradle

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {

samples/client/petstore/java/jersey2/build.gradle

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {

samples/client/petstore/java/okhttp-gson/build.gradle

@@ -1,24 +1,83 @@
+group = 'io.swagger'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+    
+    android {
+        compileSdkVersion 22
+        buildToolsVersion '22.0.0'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 22
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+    
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
+    }
+    
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+            task.description = "Create jar artifact for ${variant.name}"
+            task.dependsOn variant.javaCompile
+            task.from variant.javaCompile.destinationDir
+            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+            artifacts.add('archives', task);
+        }
+    }
+    
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+    
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
     apply plugin: 'java'
     apply plugin: 'maven'
     
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
     
-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'
@@ -29,3 +88,12 @@ task execute(type:JavaExec) {
        main = System.getProperty('mainClass')
        classpath = sourceSets.main.runtimeClasspath
     }
+}
+
+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'
+}

samples/client/petstore/java/retrofit/build.gradle

@@ -43,6 +43,10 @@ if(hasProperty('target') && target == 'android') {
                 }
             }
         }
+
+        dependencies {
+            provided 'javax.annotation:jsr250-api:1.0'
+        }
     }
     
     afterEvaluate {