Skip to content

Commit 3d2f09a

Browse files
committed
updated versions
1 parent 33c2b1b commit 3d2f09a

File tree

180 files changed

+22311
-26357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+22311
-26357
lines changed

modules/swagger-codegen-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.1.1</version>
6+
<version>2.1.2</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

modules/swagger-codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.1.1</version>
6+
<version>2.1.2</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

modules/swagger-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.swagger</groupId>
66
<artifactId>swagger-codegen-project</artifactId>
7-
<version>2.1.1</version>
7+
<version>2.1.2</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-generator</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<artifactId>swagger-codegen-project</artifactId>
1111
<packaging>pom</packaging>
1212
<name>swagger-codegen-project</name>
13-
<version>2.1.1</version>
13+
<version>2.1.2</version>
1414
<url>https://github.com/swagger-api/swagger-codegen</url>
1515
<scm>
1616
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,87 @@
1-
group = 'io.swagger'
2-
project.version = '1.0.0'
1+
group = 'io.swagger'
2+
project.version = '1.0.0'
33

44
buildscript {
5-
repositories {
6-
jcenter()
7-
}
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:1.2.2'
10-
classpath 'com.github.dcendents:android-maven-plugin:1.2'
11-
}
5+
repositories {
6+
jcenter()
7+
}
8+
dependencies {
9+
classpath 'com.android.tools.build:gradle:1.2.2'
10+
11+
classpath 'com.github.dcendents:android-maven-plugin:1.2'
12+
13+
}
1214
}
1315

1416
allprojects {
15-
repositories {
16-
jcenter()
17-
}
17+
repositories {
18+
jcenter()
19+
}
1820
}
1921

2022

2123
apply plugin: 'com.android.library'
22-
apply plugin: 'com.github.dcendents.android-maven'
24+
apply plugin: 'com.github.dcendents.android-maven'
2325

2426
android {
25-
compileSdkVersion 22
26-
buildToolsVersion '22.0.0'
27-
defaultConfig {
28-
minSdkVersion 14
29-
targetSdkVersion 22
30-
}
27+
compileSdkVersion 22
28+
buildToolsVersion '22.0.0'
29+
defaultConfig {
30+
minSdkVersion 14
31+
targetSdkVersion 22
32+
}
3133

32-
// Rename the aar correctly
33-
libraryVariants.all { variant ->
34-
variant.outputs.each { output ->
35-
def outputFile = output.outputFile
36-
if (outputFile != null && outputFile.name.endsWith('.aar')) {
37-
def fileName = "${project.name}-${variant.baseName}-${version}.aar"
38-
output.outputFile = new File(outputFile.parent, fileName)
39-
}
40-
}
41-
}
34+
// Rename the aar correctly
35+
libraryVariants.all { variant ->
36+
variant.outputs.each { output ->
37+
def outputFile = output.outputFile
38+
if (outputFile != null && outputFile.name.endsWith('.aar')) {
39+
def fileName = "${project.name}-${variant.baseName}-${version}.aar"
40+
output.outputFile = new File(outputFile.parent, fileName)
41+
}
42+
}
43+
}
4244
}
4345

4446

4547
ext {
46-
swagger_annotations_version = "1.5.0"
47-
gson_version = "2.3.1"
48-
httpclient_version = "4.3.3"
49-
junit_version = "4.8.1"
48+
swagger_annotations_version = "1.5.0"
49+
gson_version = "2.3.1"
50+
httpclient_version = "4.3.3"
51+
junit_version = "4.8.1"
5052
}
5153

5254
dependencies {
53-
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
54-
compile "com.google.code.gson:gson:$gson_version"
55-
compile "org.apache.httpcomponents:httpcore:$httpclient_version"
56-
compile "org.apache.httpcomponents:httpclient:$httpclient_version"
57-
compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
58-
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
59-
}
60-
compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
61-
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
62-
}
63-
testCompile "junit:junit:$junit_version"
55+
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
56+
compile "com.google.code.gson:gson:$gson_version"
57+
compile "org.apache.httpcomponents:httpcore:$httpclient_version"
58+
compile "org.apache.httpcomponents:httpclient:$httpclient_version"
59+
compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
60+
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
61+
}
62+
compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
63+
exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
64+
}
65+
testCompile "junit:junit:$junit_version"
6466
}
6567

6668
afterEvaluate {
67-
android.libraryVariants.all { variant ->
68-
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
69-
task.description = "Create jar artifact for ${variant.name}"
70-
task.dependsOn variant.javaCompile
71-
task.from variant.javaCompile.destinationDir
72-
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
73-
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
74-
artifacts.add('archives', task);
75-
}
69+
android.libraryVariants.all { variant ->
70+
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
71+
task.description = "Create jar artifact for ${variant.name}"
72+
task.dependsOn variant.javaCompile
73+
task.from variant.javaCompile.destinationDir
74+
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
75+
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
76+
artifacts.add('archives', task);
77+
}
7678
}
7779

78-
task sourcesJar(type: Jar) {
80+
task sourcesJar(type: Jar) {
7981
from android.sourceSets.main.java.srcDirs
8082
classifier = 'sources'
81-
}
83+
}
8284

83-
artifacts {
85+
artifacts {
8486
archives sourcesJar
85-
}
87+
}

0 commit comments

Comments
 (0)