loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

add switcgh to determine java8, java7 (#5541)

Browse Source
This commit is contained in:
wing328 2017-05-03 16:41:58 +08:00 committed by GitHub
parent 43812cc002
commit e28471341c
10 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
View File

@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') {
targetSdkVersion 25 targetSdkVersion 25
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly

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

@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') {
targetSdkVersion 25 targetSdkVersion 25
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly

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

@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') {
targetSdkVersion 25 targetSdkVersion 25
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly

4
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
View File

@ -119,8 +119,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version> <version>3.6.1</version>
<configuration> <configuration>
<source>1.7</source> <source>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</source>
<target>1.7</target> <target>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

6
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
View File

@ -32,8 +32,14 @@ if(hasProperty('target') && target == 'android') {
targetSdkVersion 25 targetSdkVersion 25
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly

6
modules/swagger-codegen/src/main/resources/android/build.mustache
View File

@ -36,8 +36,14 @@ android {
targetSdkVersion 25 targetSdkVersion 25
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly

6
modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
View File

@ -35,8 +35,14 @@ android {
targetSdkVersion 25 targetSdkVersion 25
} }
compileOptions { compileOptions {
{{#java8}}
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
{{/java8}}
{{^java8}}
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
{{/java8}}
} }
// Rename the aar correctly // Rename the aar correctly

4
modules/swagger-codegen/src/main/resources/android/libraries/volley/pom.mustache
View File

@ -49,8 +49,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version> <version>3.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</source>
<target>1.6</target> <target>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
modules/swagger-codegen/src/main/resources/android/pom.mustache
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version> <version>3.6.1</version>
<configuration> <configuration>
<source>1.7</source> <source>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</source>
<target>1.7</target> <target>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
samples/client/petstore/android/volley/pom.xml
View File

@ -49,8 +49,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version> <version>3.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>1.7</source>
<target>1.6</target> <target>1.7</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>