Skip to content

Commit 6a0a7e4

Browse files
committed
update dependencies
replaced `com.reprezen.kaizen.oasparser.OpenApi3Parser` with `io.swagger.v3.parser.OpenAPIV3Parser` Signed-off-by: Tristan Leo <[email protected]>
1 parent 10a5097 commit 6a0a7e4

File tree

3 files changed

+39
-7
lines changed

3 files changed

+39
-7
lines changed

.github/workflows/publishgh.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Publish package to the Maven Central Repository and GitHub Packages
2+
on:
3+
release:
4+
types: [created]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
permissions:
9+
contents: read
10+
packages: write
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Set up Java
14+
uses: actions/setup-java@v2
15+
with:
16+
java-version: '16'
17+
distribution: 'adopt'
18+
- name: Validate Gradle wrapper
19+
uses: gradle/wrapper-validation-action@v1
20+
- name: Publish to the Maven Central Repository
21+
run: gradle publish
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.5.0'
2+
ext.kotlin_version = '1.5.20'
33
ext.jackson_version = '2.12.3'
44

55
repositories {
66
mavenCentral()
7-
jcenter()
87
}
98
dependencies {
109
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
1210
}
1311
}
1412

@@ -82,6 +80,17 @@ publishing {
8280
}
8381
}
8482
}
83+
84+
repositories {
85+
maven {
86+
name = "GitHubPackages"
87+
url = "https://maven.pkg.github.com/octocat/hello-world"
88+
credentials {
89+
username = System.getenv("GITHUB_ACTOR")
90+
password = System.getenv("GITHUB_TOKEN")
91+
}
92+
}
93+
}
8594
}
8695

8796
nexusPublishing {
@@ -113,11 +122,11 @@ dependencies {
113122
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "$jackson_version"
114123
implementation "com.fasterxml.jackson.module:jackson-module-jsonSchema:$jackson_version"
115124
implementation "com.fasterxml.jackson.datatype:jackson-datatype-json-org:$jackson_version"
116-
implementation group: 'com.reprezen.kaizen', name: 'openapi-parser', version: '4.0.4'
117125
api 'io.swagger.core.v3:swagger-core:2.1.9'
126+
api 'io.swagger.parser.v3:swagger-parser:2.0.26'
118127
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
119128
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.4.2'
120-
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
129+
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.31'
121130
}
122131

123132
compileKotlin {

src/main/kotlin/cc/vileda/openapi/dsl/OpenApiDsl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package cc.vileda.openapi.dsl
22

3-
import com.reprezen.kaizen.oasparser.OpenApi3Parser
43
import io.swagger.v3.core.converter.ModelConverters
54
import io.swagger.v3.core.util.Json
65
import io.swagger.v3.oas.models.*
@@ -16,6 +15,7 @@ import io.swagger.v3.oas.models.servers.Server
1615
import io.swagger.v3.oas.models.servers.ServerVariable
1716
import io.swagger.v3.oas.models.servers.ServerVariables
1817
import io.swagger.v3.oas.models.tags.Tag
18+
import io.swagger.v3.parser.OpenAPIV3Parser
1919
import org.json.JSONObject
2020
import java.io.File
2121
import java.math.BigDecimal
@@ -32,7 +32,7 @@ fun openapiDsl(init: OpenAPI.() -> Unit): OpenAPI {
3232

3333
internal fun validatedJson(api: OpenAPI): JSONObject {
3434
val json = Json.mapper().writeValueAsString(api)
35-
OpenApi3Parser().parse(toFile(json), true)
35+
OpenAPIV3Parser().read(toFile(json).absolutePath)
3636
return JSONObject(json)
3737
}
3838

0 commit comments

Comments
 (0)