Merge branch 'develop' into release

SMILEY4 · Jun 18, 2023 · 199baa6 · 199baa6
2 parents dbafdb7 + 0619173
commit 199baa6
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 33 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,32 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
     kotlin("jvm") version "1.7.21"
-    `maven-publish`
-    id("org.owasp.dependencycheck") version "8.2.1"
     kotlin("plugin.serialization") version "1.8.21"
+    id("org.owasp.dependencycheck") version "8.2.1"
+    id("com.vanniktech.maven.publish") version "0.25.2"
+}
+
+object Meta {
+    const val groupId = "io.github.smiley4"
+    const val artifactId = "ktor-swagger-ui"
+    const val version = "2.2.0"
+    const val name = "Ktor Swagger-UI"
+    const val description = "Ktor plugin to document routes and provide Swagger UI"
+    const val licenseName = "The Apache License, Version 2.0"
+    const val licenseUrl = "https://www.apache.org/licenses/LICENSE-2.0.txt"
+    const val scmUrl = "https://github.com/SMILEY4/ktor-swagger-ui"
+    const val scmConnection = "scm:git:git://github.com/SMILEY4/ktor-swagger-ui.git"
+    const val developerName = "smiley4"
+    const val developerUrl = "https://github.com/SMILEY4"
 }
 
-group = "io.github.smiley4"
-version = "2.1.0"
+group = Meta.groupId
+version = Meta.version
+
 
 repositories {
     mavenCentral()
-    maven(url = "https://raw.githubusercontent.com/glureau/json-schema-serialization/mvn-repo")
 }
 
 dependencies {
@@ -63,28 +77,34 @@ dependencies {
     testImplementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 }
 
-tasks.test {
-    useJUnitPlatform()
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-java {
-    withJavadocJar()
-    withSourcesJar()
+kotlin {
+    jvmToolchain(8)
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            artifactId = "ktor-swagger-ui"
-            from(components["java"])
-            pom {
-                name.set("Ktor Swagger-UI")
-                description.set("Ktor plugin to document routes and provide Swagger UI ")
-                url.set("https://github.com/SMILEY4/ktor-swagger-ui")
+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
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #