-
-
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.
- Loading branch information
1 parent
f1a536a
commit 84d623e
Showing
19 changed files
with
154 additions
and
145 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
samples/client/petstore/android/httpclient/.openapi-generator/VERSION
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 |
---|---|---|
@@ -1 +1 @@ | ||
6.0.0-SNAPSHOT | ||
7.7.0-SNAPSHOT |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,92 +1,60 @@ | ||
group = 'org.openapitools' | ||
project.version = '1.0.0' | ||
|
||
buildscript { | ||
repositories { | ||
maven { url "https://repo1.maven.org/maven2" } | ||
jcenter() | ||
} | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:2.3.+' | ||
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' | ||
} | ||
plugins { | ||
id 'com.android.library' version '8.0.0' | ||
id 'maven-publish' | ||
} | ||
|
||
allprojects { | ||
repositories { | ||
jcenter() | ||
} | ||
} | ||
|
||
|
||
apply plugin: 'com.android.library' | ||
apply plugin: 'com.github.dcendents.android-maven' | ||
|
||
android { | ||
compileSdkVersion 25 | ||
buildToolsVersion '25.0.2' | ||
namespace "org.openapitools.client" | ||
compileSdkVersion 33 | ||
buildToolsVersion '34.0.0' | ||
useLibrary 'org.apache.http.legacy' | ||
defaultConfig { | ||
minSdkVersion 14 | ||
targetSdkVersion 25 | ||
targetSdkVersion 33 | ||
} | ||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_1_8 | ||
targetCompatibility JavaVersion.VERSION_1_8 | ||
} | ||
|
||
// 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) | ||
} | ||
publishing { | ||
singleVariant('release') { | ||
withSourcesJar() | ||
} | ||
} | ||
} | ||
|
||
|
||
ext { | ||
swagger_annotations_version = "1.6.6" | ||
gson_version = "2.8.9" | ||
gson_version = "2.10.1" | ||
httpclient_version = "4.5.13" | ||
httpcore_version = "4.4.4" | ||
junit_version = "4.13" | ||
} | ||
|
||
dependencies { | ||
compile "io.swagger:swagger-annotations:$swagger_annotations_version" | ||
compile "com.google.code.gson:gson:$gson_version" | ||
compile "org.apache.httpcomponents:httpcore:$httpcore_version" | ||
compile "org.apache.httpcomponents:httpclient:$httpclient_version" | ||
compile ("org.apache.httpcomponents:httpcore:$httpcore_version") { | ||
implementation "io.swagger:swagger-annotations:$swagger_annotations_version" | ||
implementation "com.google.code.gson:gson:$gson_version" | ||
implementation "org.apache.httpcomponents:httpcore:$httpcore_version" | ||
implementation "org.apache.httpcomponents:httpclient:$httpclient_version" | ||
implementation ("org.apache.httpcomponents:httpcore:$httpcore_version") { | ||
exclude(group: 'org.apache.httpcomponents', module: 'httpclient') | ||
} | ||
compile ("org.apache.httpcomponents:httpmime:$httpclient_version") { | ||
implementation ("org.apache.httpcomponents:httpmime:$httpclient_version") { | ||
exclude(group: 'org.apache.httpcomponents', module: 'httpclient') | ||
} | ||
testCompile "junit:junit:$junit_version" | ||
testImplementation "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); | ||
} | ||
} | ||
publishing { | ||
publications { | ||
release(MavenPublication) { | ||
groupId = 'org.openapitools' | ||
artifactId = 'openapi-android-client' | ||
version = '1.0.0' | ||
|
||
task sourcesJar(type: Jar) { | ||
from android.sourceSets.main.java.srcDirs | ||
classifier = 'sources' | ||
} | ||
|
||
artifacts { | ||
archives sourcesJar | ||
afterEvaluate { | ||
from components.release | ||
} | ||
} | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
samples/client/petstore/android/httpclient/gradle/wrapper/gradle-wrapper.properties
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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
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
16 changes: 16 additions & 0 deletions
16
samples/client/petstore/android/httpclient/settings.gradle
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 |
---|---|---|
@@ -1 +1,17 @@ | ||
pluginManagement { | ||
repositories { | ||
gradlePluginPortal() | ||
google() | ||
mavenCentral() | ||
} | ||
} | ||
|
||
dependencyResolutionManagement { | ||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) | ||
repositories { | ||
google() | ||
mavenCentral() | ||
} | ||
} | ||
|
||
rootProject.name = "openapi-android-client" |
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
2 changes: 1 addition & 1 deletion
2
samples/client/petstore/android/volley/.openapi-generator/VERSION
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 |
---|---|---|
@@ -1 +1 @@ | ||
6.0.0-SNAPSHOT | ||
7.7.0-SNAPSHOT |
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.