diff --git a/build.gradle.kts b/build.gradle.kts index 432b31ae..99da2505 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,6 @@ plugins { id("org.owasp.dependencycheck") version "8.2.1" id("com.vanniktech.maven.publish") version "0.25.2" id("io.gitlab.arturbosch.detekt") version "1.23.0" - `maven-publish` } repositories { @@ -106,31 +105,31 @@ tasks.withType().configureEach { } } -// mavenPublishing { -// publishToMavenCentral(SonatypeHost.S01) -// signAllPublications() -// coordinates(Meta.groupId, Meta.artifactId, Meta.version) -// pom { -// name.set(Meta.name) -// description.set(Meta.description) -// url.set(Meta.scmUrl) -// licenses { -// license { -// name.set(Meta.licenseName) -// url.set(Meta.licenseUrl) -// distribution.set(Meta.licenseUrl) -// } -// } -// scm { -// url.set(Meta.scmUrl) -// connection.set(Meta.scmConnection) -// } -// developers { -// developer { -// id.set(Meta.developerName) -// name.set(Meta.developerName) -// url.set(Meta.developerUrl) -// } -// } -// } -// } +mavenPublishing { + publishToMavenCentral(SonatypeHost.S01) + signAllPublications() + coordinates(Meta.groupId, Meta.artifactId, Meta.version) + pom { + name.set(Meta.name) + description.set(Meta.description) + url.set(Meta.scmUrl) + licenses { + license { + name.set(Meta.licenseName) + url.set(Meta.licenseUrl) + distribution.set(Meta.licenseUrl) + } + } + scm { + url.set(Meta.scmUrl) + connection.set(Meta.scmConnection) + } + developers { + developer { + id.set(Meta.developerName) + name.set(Meta.developerName) + url.set(Meta.developerUrl) + } + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0af314fa..41dfb879 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://mirror.nju.edu.cn/gradle/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index adb3fe10..00000000 --- a/jitpack.yml +++ /dev/null @@ -1,2 +0,0 @@ -jdk: - - openjdk11 diff --git a/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/PluginConfigData.kt b/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/PluginConfigData.kt index 801ee80f..7e07e7c7 100644 --- a/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/PluginConfigData.kt +++ b/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/PluginConfigData.kt @@ -1,8 +1,7 @@ package io.github.smiley4.ktorswaggerui.data -import io.github.smiley4.ktorswaggerui.dsl.PluginConfigDsl import io.github.smiley4.ktorswaggerui.dsl.OpenApiResponse -import io.github.smiley4.ktorswaggerui.dsl.WhenBuildOpenApiSpecs +import io.github.smiley4.ktorswaggerui.dsl.PluginConfigDsl import kotlin.reflect.KClass data class PluginConfigData( diff --git a/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/WhenBuildOpenApiSpecs.kt b/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/WhenBuildOpenApiSpecs.kt new file mode 100644 index 00000000..175ddc93 --- /dev/null +++ b/src/main/kotlin/io/github/smiley4/ktorswaggerui/data/WhenBuildOpenApiSpecs.kt @@ -0,0 +1,8 @@ +package io.github.smiley4.ktorswaggerui.data + +import io.swagger.v3.oas.models.OpenAPI + +/** + * @author yuefeng in 2024/3/25. + */ +typealias WhenBuildOpenApiSpecs = (openApi: OpenAPI) -> Unit diff --git a/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/PluginConfigDsl.kt b/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/PluginConfigDsl.kt index 667bc971..b58f937f 100644 --- a/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/PluginConfigDsl.kt +++ b/src/main/kotlin/io/github/smiley4/ktorswaggerui/dsl/PluginConfigDsl.kt @@ -1,17 +1,22 @@ package io.github.smiley4.ktorswaggerui.dsl +import io.github.smiley4.ktorswaggerui.data.* import io.github.smiley4.ktorswaggerui.data.DataUtils.merge import io.github.smiley4.ktorswaggerui.data.DataUtils.mergeBoolean -import io.github.smiley4.ktorswaggerui.data.PathFilter -import io.github.smiley4.ktorswaggerui.data.PluginConfigData -import io.github.smiley4.ktorswaggerui.data.SecuritySchemeData -import io.github.smiley4.ktorswaggerui.data.ServerData -import io.github.smiley4.ktorswaggerui.data.SpecAssigner -import io.github.smiley4.ktorswaggerui.data.TagData -import io.github.smiley4.ktorswaggerui.data.TagGenerator import io.ktor.http.* -import io.ktor.server.routing.RouteSelector -import io.swagger.v3.oas.models.OpenAPI +import io.ktor.server.routing.* +import kotlin.collections.Collection +import kotlin.collections.Set +import kotlin.collections.buildList +import kotlin.collections.buildMap +import kotlin.collections.buildSet +import kotlin.collections.component1 +import kotlin.collections.component2 +import kotlin.collections.forEach +import kotlin.collections.map +import kotlin.collections.mutableListOf +import kotlin.collections.mutableMapOf +import kotlin.collections.set import kotlin.reflect.KClass /** @@ -211,5 +216,3 @@ class PluginConfigDsl { } } } - -typealias WhenBuildOpenApiSpecs = (openApi: OpenAPI) -> Unit \ No newline at end of file