-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve Apache Httpclient support (#10624)
* Move apache-httpclient templates to proper dir * Add template for Gradle * Fix few JavaDoc compile warnings * Add properly generated samples * Empty just trigger PR checks rebuild
- Loading branch information
Showing
17 changed files
with
1,098 additions
and
291 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
169 changes: 169 additions & 0 deletions
169
...enapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| apply plugin: 'idea' | ||
| apply plugin: 'eclipse' | ||
|
|
||
| group = '{{groupId}}' | ||
| version = '{{artifactVersion}}' | ||
|
|
||
| buildscript { | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:2.3.+' | ||
| classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| if(hasProperty('target') && target == 'android') { | ||
| apply plugin: 'com.android.library' | ||
| apply plugin: 'com.github.dcendents.android-maven' | ||
| android { | ||
| compileSdkVersion 25 | ||
| buildToolsVersion '25.0.2' | ||
| defaultConfig { | ||
| minSdkVersion 14 | ||
| targetSdkVersion 25 | ||
| } | ||
|
|
||
| compileOptions { | ||
| {{#java8}} | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| {{/java8}} | ||
| {{^java8}} | ||
| sourceCompatibility JavaVersion.VERSION_1_7 | ||
| targetCompatibility JavaVersion.VERSION_1_7 | ||
| {{/java8}} | ||
| } | ||
|
|
||
| // 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 "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_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); | ||
| } | ||
| } | ||
|
|
||
| task sourcesJar(type: Jar) { | ||
| from android.sourceSets.main.java.srcDirs | ||
| classifier = 'sources' | ||
| } | ||
|
|
||
| artifacts { | ||
| archives sourcesJar | ||
| } | ||
|
|
||
| } else { | ||
| apply plugin: 'java' | ||
| apply plugin: 'maven-publish' | ||
| {{#java8}} | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| {{/java8}} | ||
| {{^java8}} | ||
| sourceCompatibility = JavaVersion.VERSION_1_7 | ||
| targetCompatibility = JavaVersion.VERSION_1_7 | ||
| {{/java8}} | ||
|
|
||
| publishing { | ||
| publications { | ||
| maven(MavenPublication) { | ||
| artifactId = '{{artifactId}}' | ||
| from components.java | ||
| } | ||
| } | ||
| } | ||
|
|
||
| task execute(type:JavaExec) { | ||
| main = System.getProperty('mainClass') | ||
| classpath = sourceSets.main.runtimeClasspath | ||
| } | ||
|
|
||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| classifier = 'sources' | ||
| from sourceSets.main.allSource | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| classifier = 'javadoc' | ||
| from javadoc.destinationDir | ||
| } | ||
|
|
||
| artifacts { | ||
| archives sourcesJar | ||
| archives javadocJar | ||
| } | ||
| } | ||
|
|
||
| ext { | ||
| swagger_annotations_version = "1.5.22" | ||
| jackson_version = "2.12.1" | ||
| jackson_databind_version = "2.10.5.1" | ||
| {{#openApiNullable}} | ||
| jackson_databind_nullable_version = "0.2.1" | ||
| {{/openApiNullable}} | ||
| jakarta_annotation_version = "1.3.5" | ||
| {{#threetenbp}} | ||
| jackson_threetenbp_version = "2.9.10" | ||
| {{/threetenbp}} | ||
| httpclient_version = "4.5.13" | ||
| jodatime_version = "2.9.9" | ||
| junit_version = "4.13.1" | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation "io.swagger:swagger-annotations:$swagger_annotations_version" | ||
| implementation "com.google.code.findbugs:jsr305:3.0.2" | ||
| implementation "org.apache.httpcomponents:httpclient:$httpclient_version" | ||
| implementation "org.apache.httpcomponents:httpmime:$httpclient_version" | ||
| implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" | ||
| implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" | ||
| implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" | ||
| implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" | ||
| {{#openApiNullable}} | ||
| implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" | ||
| {{/openApiNullable}} | ||
| {{#joda}} | ||
| implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" | ||
| {{/joda}} | ||
| {{#java8}} | ||
| implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" | ||
| {{/java8}} | ||
| {{#threetenbp}} | ||
| implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" | ||
| {{/threetenbp}} | ||
| {{^java8}} | ||
| implementation "com.brsanthu:migbase64:2.2" | ||
| {{/java8}} | ||
| implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" | ||
| testImplementation "junit:junit:$junit_version" | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.