Skip to content

merge from develop 2.0 for release #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Jun 9, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0dd8670
rollback python template
wing328 Jun 9, 2015
d5cbbae
rollback ruby swagger template
wing328 Jun 9, 2015
5f6622c
rollback ruby template
wing328 Jun 9, 2015
2e12ac5
rollback perl template
wing328 Jun 9, 2015
50ae965
rollback php template
wing328 Jun 9, 2015
263b408
rollback python3 template
wing328 Jun 9, 2015
6253bbf
roll back qt5cpp template
wing328 Jun 9, 2015
eee8685
rollback flash template
wing328 Jun 9, 2015
eede02a
rollback nodejs and htmldocs template
wing328 Jun 9, 2015
b1f5c03
rollback objc templates
wing328 Jun 9, 2015
7d6fdf9
rollback retroit template
wing328 Jun 9, 2015
b636d2a
rollback scala template
wing328 Jun 9, 2015
f2ee63d
rollback scalatra template
wing328 Jun 9, 2015
d8060f4
rollback swagger-static template
wing328 Jun 9, 2015
410144e
rollback swift template
wing328 Jun 9, 2015
6617af5
rollback tizen template
wing328 Jun 9, 2015
6efef51
rollback validator template
wing328 Jun 9, 2015
a8f6044
rollback akka-scala template
wing328 Jun 9, 2015
ab9daaa
rollback android template
wing328 Jun 9, 2015
f610958
rollback asyncscala template
wing328 Jun 9, 2015
7b6480f
rollback codegen template
wing328 Jun 9, 2015
46c5b77
rollback csharp template
wing328 Jun 9, 2015
900f396
rollback grovvy template
wing328 Jun 9, 2015
180d48e
rollback java template
wing328 Jun 9, 2015
29c41ad
rollback java jxrs template
wing328 Jun 9, 2015
fc38b9b
rollback akkascala to another commit (637ee77d66dbcd2a94a22941754158d…
wing328 Jun 9, 2015
d155ddd
rollback java spring mvc template
wing328 Jun 9, 2015
7fd996b
update php sample
wing328 Jun 9, 2015
a593271
rollback flash apiinvoker based on 8ee8eddcff26d72a89538bcdac39f2f730…
wing328 Jun 9, 2015
680078d
fix csharp refer to apiinvoker
wing328 Jun 9, 2015
3b3738e
Merge pull request #847 from wing328/fix_indentation
fehguy Jun 9, 2015
207776c
udpate podfile
wing328 Jun 9, 2015
33c2b1b
Merge pull request #849 from wing328/fix_podfile
fehguy Jun 9, 2015
3d2f09a
updated versions
fehguy Jun 9, 2015
570383d
updated name, disabled test
fehguy Jun 9, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated versions
  • Loading branch information
fehguy committed Jun 9, 2015
commit 3d2f09a693fc5cf966cd4bbbcaadc41f7f386e26
2 changes: 1 addition & 1 deletion modules/swagger-codegen-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-project</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-project</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-project</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>swagger-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<artifactId>swagger-codegen-project</artifactId>
<packaging>pom</packaging>
<name>swagger-codegen-project</name>
<version>2.1.1</version>
<version>2.1.2</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<scm>
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
Expand Down
116 changes: 59 additions & 57 deletions samples/client/petstore/android-java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,85 +1,87 @@
group = 'io.swagger'
project.version = '1.0.0'
group = 'io.swagger'
project.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()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.2'

classpath 'com.github.dcendents:android-maven-plugin:1.2'

}
}

allprojects {
repositories {
jcenter()
}
repositories {
jcenter()
}
}


apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.github.dcendents.android-maven'

android {
compileSdkVersion 22
buildToolsVersion '22.0.0'
defaultConfig {
minSdkVersion 14
targetSdkVersion 22
}
compileSdkVersion 22
buildToolsVersion '22.0.0'
defaultConfig {
minSdkVersion 14
targetSdkVersion 22
}

// 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)
}
}
}
// 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)
}
}
}
}


ext {
swagger_annotations_version = "1.5.0"
gson_version = "2.3.1"
httpclient_version = "4.3.3"
junit_version = "4.8.1"
swagger_annotations_version = "1.5.0"
gson_version = "2.3.1"
httpclient_version = "4.3.3"
junit_version = "4.8.1"
}

dependencies {
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "com.google.code.gson:gson:$gson_version"
compile "org.apache.httpcomponents:httpcore:$httpclient_version"
compile "org.apache.httpcomponents:httpclient:$httpclient_version"
compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
}
compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
}
testCompile "junit:junit:$junit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "com.google.code.gson:gson:$gson_version"
compile "org.apache.httpcomponents:httpcore:$httpclient_version"
compile "org.apache.httpcomponents:httpclient:$httpclient_version"
compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
}
compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
}
testCompile "junit:junit:$junit_version"
}

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);
}
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) {
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
}

artifacts {
artifacts {
archives sourcesJar
}
}
Loading