Skip to content
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.

Sign up for GitHub

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

[gradle plugin] Support Gradle 4.10 #1011

Merged
merged 3 commits into from
Sep 12, 2018
Merged

[gradle plugin] Support Gradle 4.10 #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b890c26
Support Gradle 4.10
jimschubert Sep 11, 2018
ee97f0f
Uncomment snapshots repo (commented it during local testing)
jimschubert Sep 11, 2018
0a0cdf5
update pom.xml for exec gradle plugin
jimschubert Sep 12, 2018
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
4 changes: 2 additions & 2 deletions modules/openapi-generator-gradle-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.2.41'
ext.kotlin_version = '1.2.60'
repositories {
mavenCentral()
maven {
Expand All @@ -14,7 +14,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "gradle.plugin.org.gradle.kotlin:gradle-kotlin-dsl-plugins:0.17.5"
classpath "gradle.plugin.org.gradle.kotlin:gradle-kotlin-dsl-plugins:1.0-rc-3"
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-4.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-rc-1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion modules/openapi-generator-gradle-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<artifactId>gradle-maven-plugin</artifactId>
<version>1.0.8</version>
<configuration>
<gradleVersion>4.7</gradleVersion>
<gradleVersion>4.10-rc-1</gradleVersion>
<args>
<arg>-P openApiGeneratorVersion=${project.version}</arg>
</args>
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ gradle generateGoWithInvalidSpec
The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:

```bash
gradle -PopenApiGeneratorVersion=3.2.3 openApiValidate
gradle -PopenApiGeneratorVersion=3.3.0 openApiValidate
```
14 changes: 8 additions & 6 deletions ...plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package org.openapitools.generator.gradle.plugin

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.invoke
import org.openapitools.generator.gradle.plugin.extensions.OpenApiGeneratorGenerateExtension
import org.openapitools.generator.gradle.plugin.extensions.OpenApiGeneratorMetaExtension
import org.openapitools.generator.gradle.plugin.extensions.OpenApiGeneratorValidateExtension
Expand Down Expand Up @@ -56,26 +55,29 @@ class OpenApiGeneratorPlugin : Plugin<Project> {

generate.outputDir.set("$buildDir/generate-resources/main")

tasks {
"openApiGenerators"(GeneratorsTask::class) {
tasks.apply {
create("openApiGenerators", GeneratorsTask::class.java) {
group = pluginGroup
description = "Lists generators available via Open API Generators."
}
"openApiMeta"(MetaTask::class) {

create("openApiMeta", MetaTask::class.java) {
group = pluginGroup
description = "Generates a new generator to be consumed via Open API Generator."

generatorName.set(meta.generatorName)
packageName.set(meta.packageName)
outputFolder.set(meta.outputFolder)
}
"openApiValidate"(ValidateTask::class) {

create("openApiValidate", ValidateTask::class.java) {
group = pluginGroup
description = "Validates an Open API 2.0 or 3.x specification document."

inputSpec.set(validate.inputSpec)
}
"openApiGenerate"(GenerateTask::class) {

create("openApiGenerate", GenerateTask::class.java) {
group = pluginGroup
description = "Generate code via Open API Tools Generator for Open API 2.0 or 3.x specification documents."

Expand Down