From f77b5da0f0aa5eadfa47094b4df8bfc0877aee9e Mon Sep 17 00:00:00 2001 From: Denis Golovnev Date: Sun, 3 Nov 2019 12:23:27 +0300 Subject: [PATCH] Remove deprecated API use of ObjectFactory.property() (#2613) (#4352) --- .../build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- modules/openapi-generator-gradle-plugin/pom.xml | 2 +- .../OpenApiGeneratorGenerateExtension.kt | 17 +++++++++-------- .../gradle/plugin/tasks/GenerateTask.kt | 17 +++++++++-------- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 442ad536754f..fa60040099e7 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.61' + ext.kotlin_version = '1.3.20' repositories { mavenLocal() mavenCentral() @@ -15,7 +15,7 @@ buildscript { } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "gradle.plugin.org.gradle.kotlin:gradle-kotlin-dsl-plugins:1.0-rc-3" + classpath "gradle.plugin.org.gradle.kotlin:gradle-kotlin-dsl-plugins:1.1.3" classpath "com.gradle.publish:plugin-publish-plugin:0.10.1" classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.20.0" classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.2.0" diff --git a/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 612f9e88edaa..44e7c4d1d7bb 100644 --- a/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://downloads.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 171855f1f2e2..5f15f1c2ce1b 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -17,7 +17,7 @@ true - 4.10.2 + 5.2.1 diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt index 01e959447fff..d7bce4b9b273 100644 --- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt +++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt @@ -18,6 +18,7 @@ package org.openapitools.generator.gradle.plugin.extensions import org.gradle.api.Project import org.gradle.kotlin.dsl.listProperty +import org.gradle.kotlin.dsl.mapProperty import org.gradle.kotlin.dsl.property /** @@ -66,7 +67,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) { /** * Sets specified system properties. */ - val systemProperties = project.objects.property>() + val systemProperties = project.objects.mapProperty() /** * Path to json configuration file. @@ -108,22 +109,22 @@ open class OpenApiGeneratorGenerateExtension(project: Project) { /** * Sets instantiation type mappings. */ - val instantiationTypes = project.objects.property>() + val instantiationTypes = project.objects.mapProperty() /** * Sets mappings between OpenAPI spec types and generated code types. */ - val typeMappings = project.objects.property>() + val typeMappings = project.objects.mapProperty() /** * Sets additional properties that can be referenced by the mustache templates. */ - val additionalProperties = project.objects.property>() + val additionalProperties = project.objects.mapProperty() /** * Sets server variable for server URL template substitution, in the format of name=value,name=value. */ - val serverVariables = project.objects.property>() + val serverVariables = project.objects.mapProperty() /** * Specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: String,boolean,Boolean,Double. @@ -133,7 +134,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) { /** * Specifies mappings between a given class and the import that should be used for that class. */ - val importMappings = project.objects.property>() + val importMappings = project.objects.mapProperty() /** * Root package for generated code. @@ -188,7 +189,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) { /** * Specifies how a reserved name should be escaped to. Otherwise, the default _ is used. */ - val reservedWordsMappings = project.objects.property>() + val reservedWordsMappings = project.objects.mapProperty() /** * Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation. @@ -304,7 +305,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) { /** * A map of options specific to a generator. */ - val configOptions = project.objects.property>() + val configOptions = project.objects.mapProperty() init { applyDefaults() diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt index 83f206fd491d..a0f2ceccf6d8 100644 --- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt +++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt @@ -24,6 +24,7 @@ import org.gradle.api.tasks.TaskAction import org.gradle.internal.logging.text.StyledTextOutput import org.gradle.internal.logging.text.StyledTextOutputFactory import org.gradle.kotlin.dsl.listProperty +import org.gradle.kotlin.dsl.mapProperty import org.gradle.kotlin.dsl.property import org.openapitools.codegen.CodegenConstants import org.openapitools.codegen.DefaultGenerator @@ -90,7 +91,7 @@ open class GenerateTask : DefaultTask() { * Sets specified system properties. */ @get:Internal - val systemProperties = project.objects.property>() + val systemProperties = project.objects.mapProperty() /** * Path to json configuration file. @@ -140,27 +141,27 @@ open class GenerateTask : DefaultTask() { * Sets instantiation type mappings. */ @get:Internal - val instantiationTypes = project.objects.property>() + val instantiationTypes = project.objects.mapProperty() /** * Sets mappings between OpenAPI spec types and generated code types. */ @get:Internal - val typeMappings = project.objects.property>() + val typeMappings = project.objects.mapProperty() /** * Sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value. * You can also have multiple occurrences of this option. */ @get:Internal - val additionalProperties = project.objects.property>() + val additionalProperties = project.objects.mapProperty() /** * Sets server variable for server URL template substitution, in the format of name=value,name=value. * You can also have multiple occurrences of this option. */ @get:Internal - val serverVariables = project.objects.property>() + val serverVariables = project.objects.mapProperty() /** * Specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: String,boolean,Boolean,Double. @@ -172,7 +173,7 @@ open class GenerateTask : DefaultTask() { * Specifies mappings between a given class and the import that should be used for that class. */ @get:Internal - val importMappings = project.objects.property>() + val importMappings = project.objects.mapProperty() /** * Root package for generated code. @@ -238,7 +239,7 @@ open class GenerateTask : DefaultTask() { * Specifies how a reserved name should be escaped to. */ @get:Internal - val reservedWordsMappings = project.objects.property>() + val reservedWordsMappings = project.objects.mapProperty() /** * Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation. @@ -372,7 +373,7 @@ open class GenerateTask : DefaultTask() { * A dynamic map of options specific to a generator. */ @get:Internal - val configOptions = project.objects.property>() + val configOptions = project.objects.mapProperty() private fun Property.ifNotEmpty(block: Property.(T) -> Unit) { if (isPresent) {