diff --git a/build.gradle.kts b/build.gradle.kts index 81d16d8..cf775f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,10 +2,10 @@ plugins { `java-gradle-plugin` id("com.gradle.plugin-publish") version "1.2.0" id("org.sonarqube") version "3.1.1" - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.8.20" `maven-publish` id("com.github.ben-manes.versions") version "0.38.0" - id("io.gitlab.arturbosch.detekt") version "1.16.0" + id("io.gitlab.arturbosch.detekt") version "1.23.1" } group = "org.springdoc" @@ -17,12 +17,12 @@ sonarqube { } } repositories { + gradlePluginPortal() mavenCentral() maven { name = "Spring Repositories" url = uri("https://repo.spring.io/libs-release/") } - gradlePluginPortal() maven { name = "Gradle Plugins Maven Repository" url = uri("https://plugins.gradle.org/m2/") @@ -57,7 +57,7 @@ dependencies { implementation("com.google.code.gson:gson:2.8.9") implementation("org.awaitility:awaitility-kotlin:4.0.3") implementation("com.github.psxpaul:gradle-execfork-plugin:0.2.0") - implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.6") + implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.14") testImplementation(gradleTestKit()) testImplementation(platform("org.junit:junit-bom:5.7.1")) @@ -66,26 +66,23 @@ dependencies { testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2") testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2") - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0") + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1") } gradlePlugin { + website = "https://github.com/springdoc/springdoc-openapi-gradle-plugin" + vcsUrl = "https://github.com/springdoc/springdoc-openapi-gradle-plugin.git" plugins { create("springdoc-gradle-plugin") { id = "org.springdoc.openapi-gradle-plugin" displayName = "A Gradle plugin for the springdoc-openapi library" description = " This plugin uses springdoc-openapi to generate an OpenAPI description at build time" implementationClass = "org.springdoc.openapi.gradle.plugin.OpenApiGradlePlugin" + tags = listOf("springdoc", "openapi", "swagger") } } } -pluginBundle { - website = "https://github.com/springdoc/springdoc-openapi-gradle-plugin" - vcsUrl = "https://github.com/springdoc/springdoc-openapi-gradle-plugin.git" - tags = listOf("springdoc", "openapi", "swagger") -} - val jvmVersion: JavaLanguageVersion = JavaLanguageVersion.of(8) java { @@ -105,7 +102,7 @@ tasks.withType().configureEach { } detekt { - config = files("config/detekt/detekt.yml") + config.setFrom("config/detekt/detekt.yml") parallel = true } tasks.withType().configureEach { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 164080a..9f4197d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/test/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePluginTest.kt b/src/test/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePluginTest.kt index 2780274..192e7b1 100644 --- a/src/test/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePluginTest.kt +++ b/src/test/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePluginTest.kt @@ -32,7 +32,7 @@ class OpenApiGradlePluginTest { private val baseBuildGradle = """plugins { id 'java' id 'org.springframework.boot' version '2.7.6' - id 'io.spring.dependency-management' version '1.1.15.RELEASE' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' id 'org.springdoc.openapi-gradle-plugin' } @@ -152,7 +152,6 @@ class OpenApiGradlePluginTest { assertOpenApiJsonFile(2) } - @Test fun `configurable wait time`() { buildFile.writeText( @@ -204,7 +203,6 @@ class OpenApiGradlePluginTest { assertOpenApiJsonFile(1) } - @Test fun `yaml generation`() { val outputYamlFileName = "openapi.yaml"