Merge pull request #1 from 1gravity/feature/publish_artifact

Feature/publish artifact

Author: 1gravity

README.md

@@ -1,6 +1,6 @@
 # Ktor OpenAPI Generator
-[![](https://jitpack.io/v/papsign/Ktor-OpenAPI-Generator.svg)](https://jitpack.io/#papsign/Ktor-OpenAPI-Generator)
-[![Build](https://github.com/papsign/Ktor-OpenAPI-Generator/workflows/Build/badge.svg)](https://github.com/papsign/Ktor-OpenAPI-Generator/actions)
+[![](https://jitpack.io/v/1gravity/Ktor-OpenAPI-Generator.svg)](https://jitpack.io/#1gravity/Ktor-OpenAPI-Generator)
+[![Build](https://github.com/1gravity/Ktor-OpenAPI-Generator/workflows/Build/badge.svg)](https://github.com/1gravity/Ktor-OpenAPI-Generator/actions)
 
 The Ktor OpenAPI Generator is a library to automatically generate the descriptor as you route your ktor application.
 
@@ -24,7 +24,7 @@ Extra Features:
 
 ## Examples
 
-Take a look at [a few examples](https://github.com/papsign/Ktor-OpenAPI-Generator/wiki/A-few-examples)
+Take a look at [a few examples](https://github.com/1gravity/Ktor-OpenAPI-Generator/wiki/A-few-examples)
 
 ### Who is using it?
 
@@ -48,14 +48,14 @@ allprojects {
 Step 2. Add the dependency:
 ```groovy
 dependencies {
-        implementation 'com.github.papsign:Ktor-OpenAPI-Generator:-SNAPSHOT'
+        implementation 'com.1gravity:Ktor-OpenAPI-Generator:-SNAPSHOT'
 }
 ```
 
 ### Git Submodule
 Install the submodule:
 ```shell
-git submodule add https://github.com/papsign/Ktor-OpenAPI-Generator.git openapigen
+git submodule add https://github.com/1gravity/Ktor-OpenAPI-Generator.git openapigen
 ```
 
 Declare the folder in settings.gradle:

build.gradle

@@ -0,0 +1,74 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm")
+    id("maven-publish")
+}
+
+repositories {
+    mavenCentral()
+}
+
+val kotlinVersion = plugins.getPlugin(KotlinPluginWrapper::class.java).kotlinPluginVersion
+val ktorVersion = findProperty("ktor_version")?.toString() ?: ""
+val slf4jVersion = findProperty("slf4j_version")?.toString() ?: ""
+val logVersion = findProperty("logback_version")?.toString()  ?: ""
+
+dependencies {
+    implementation(kotlin("stdlib", kotlinVersion))
+    implementation("org.slf4j:slf4j-api:$slf4jVersion")
+    implementation("io.ktor:ktor-server-core:$ktorVersion")
+    implementation("io.ktor:ktor-server-host-common:$ktorVersion")
+    implementation("io.ktor:ktor-metrics:$ktorVersion")
+    implementation("io.ktor:ktor-server-sessions:$ktorVersion")
+
+    implementation("io.ktor:ktor-jackson:$ktorVersion") // needed for parameter parsing and multipart parsing
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8") // needed for multipart parsing
+    implementation("org.webjars:swagger-ui:3.25.0")
+
+    implementation("org.reflections:reflections:0.9.11") // only used while initializing
+
+    testImplementation("io.ktor:ktor-server-netty:$ktorVersion")
+    testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
+    testImplementation("ch.qos.logback:logback-classic:$logVersion")
+    testImplementation("io.ktor:ktor-auth:$ktorVersion")
+    testImplementation("io.ktor:ktor-auth-jwt:$ktorVersion")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xuse-experimental=kotlin.ExperimentalStdlibApi")
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            group = "com.1gravity"
+            artifactId = "ktor-openapi-generator"
+            version = "0.2-beta.17"
+
+            from(components["java"])
+
+            pom {
+                name.set("Ktor OpenAPI Generator")
+                description.set("The Ktor OpenAPI Generator automatically generate the OpenAPI documentation based on the Ktor application routing definition")
+                packaging = "jar"
+
+                licenses {
+                    license {
+                        name.set("The Apache License, Version 2.0")
+                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                    }
+                }
+            }
+        }
+    }
+}

build.gradle.kts

@@ -1,5 +1,9 @@
 kotlin.code.style=official
-ktor_version=1.3.2
-logback_version=1.2.1
+
+# plugins
+kotlinVersion=1.4.32
+
+# libraries
+ktor_version=1.5.3
+logback_version=1.2.2
 slf4j_version=1.7.30
-kotlin_version=1.3.70

gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,9 @@
+rootProject.name = "com.papsign.ktor.openapigen"
+
+pluginManagement {
+    val kotlinVersion: String by settings
+
+    plugins {
+        kotlin("jvm") version kotlinVersion
+    }
+}

settings.gradle

@@ -5,9 +5,7 @@ import com.papsign.ktor.openapigen.route.path.normal.post
 import com.papsign.ktor.openapigen.route.response.respond
 import com.papsign.ktor.openapigen.route.route
 import installOpenAPI
-import io.ktor.http.ContentType
-import io.ktor.http.HttpHeaders
-import io.ktor.http.HttpMethod
+import io.ktor.http.*
 import io.ktor.server.testing.contentType
 import io.ktor.server.testing.handleRequest
 import io.ktor.server.testing.setBody
@@ -21,7 +19,6 @@ const val contentType = "image/png"
 
 class BinaryContentTypeParserTest {
 
-
     @BinaryRequest([contentType])
     @BinaryResponse([contentType])
     data class Stream(val stream: InputStream)
@@ -68,7 +65,7 @@ class BinaryContentTypeParserTest {
                 addHeader(HttpHeaders.Accept, contentType)
                 setBody(bytes)
             }.apply {
-                assertNull(response.status())
+                assertEquals(response.status(), HttpStatusCode.NotFound)
             }
 
             println("Test: Bad Accept")
@@ -77,7 +74,7 @@ class BinaryContentTypeParserTest {
                 addHeader(HttpHeaders.Accept, ContentType.Application.Json.toString())
                 setBody(bytes)
             }.apply {
-                assertNull(response.status())
+                assertEquals(response.status(), HttpStatusCode.NotFound)
             }
 
             println("Test: Bad Content-Type")
@@ -86,7 +83,7 @@ class BinaryContentTypeParserTest {
                 addHeader(HttpHeaders.Accept, contentType)
                 setBody(bytes)
             }.apply {
-                assertNull(response.status())
+                assertEquals(response.status(), HttpStatusCode.NotFound)
             }
         }
     }