Skip to content

Commit f35fdc3

Browse files
committed
fix api usage
1 parent 1747d67 commit f35fdc3

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,16 @@ tasks.named('sourcesJar') {
9393
dependencies {
9494
implementation (libs.openapi.processor.api)
9595
implementation (libs.openapi.processor.core)
96+
implementation (libs.openapi.processor.test.api)
9697
implementation (libs.openapi.processor.parser.api)
9798
implementation (libs.openapi.processor.parser.swagger)
9899
implementation (libs.openapi.processor.parser.openapi4j)
99100
implementation (libs.slf4j)
100101

101102
testImplementation (libs.openapi.processor.api)
102-
testImplementation (libs.openapi.processor.test)
103103
testImplementation (libs.openapi.processor.core)
104+
testImplementation (libs.openapi.processor.test.api)
105+
testImplementation (libs.openapi.processor.test.base)
104106
testImplementation (libs.openapi.processor.parser.api)
105107
testImplementation (libs.openapi.processor.parser.swagger)
106108
testImplementation (libs.openapi.processor.parser.openapi4j)
@@ -116,8 +118,9 @@ dependencies {
116118
testImplementation (libs.jimfs)
117119

118120
testIntImplementation (libs.openapi.processor.api)
119-
testIntImplementation (libs.openapi.processor.test)
120121
testIntImplementation (libs.openapi.processor.core)
122+
testIntImplementation (libs.openapi.processor.test.api)
123+
testIntImplementation (libs.openapi.processor.test.base)
121124
testIntImplementation (libs.openapi.processor.parser.api)
122125
testIntImplementation (libs.openapi.processor.parser.swagger)
123126
testIntImplementation (libs.openapi.processor.parser.openapi4j)

gradle/libs.versions.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ build-jdk = "11"
44
test-jdk = "11"
55

66
api = "2024.1"
7-
core = "2024.6.1"
7+
base = "2024.7-SNAPSHOT"
88

99
junit = "5.9.3"
1010
jacoco = "0.8.7"
1111

1212
[libraries]
1313
openapi-processor-api = { module = "io.openapiprocessor:openapi-processor-api", version.ref = "api" }
14-
openapi-processor-test = { module = "io.openapiprocessor:openapi-processor-test", version.ref = "core" }
15-
openapi-processor-core = { module = "io.openapiprocessor:openapi-processor-core", version.ref = "core" }
16-
openapi-processor-parser-api = { module = "io.openapiprocessor:openapi-processor-core-parser-api", version.ref = "core" }
17-
openapi-processor-parser-swagger = { module = "io.openapiprocessor:openapi-processor-core-parser-swagger", version.ref = "core" }
18-
openapi-processor-parser-openapi4j = { module ="io.openapiprocessor:openapi-processor-core-parser-openapi4j", version.ref = "core" }
14+
openapi-processor-test-base = { module = "io.openapiprocessor:openapi-processor-test", version.ref = "base" }
15+
openapi-processor-test-api = { module = "io.openapiprocessor:openapi-processor-test-api", version.ref = "base" }
16+
openapi-processor-core = { module = "io.openapiprocessor:openapi-processor-core", version.ref = "base" }
17+
openapi-processor-parser-api = { module = "io.openapiprocessor:openapi-processor-core-parser-api", version.ref = "base" }
18+
openapi-processor-parser-swagger = { module = "io.openapiprocessor:openapi-processor-core-parser-swagger", version.ref = "base" }
19+
openapi-processor-parser-openapi4j = { module ="io.openapiprocessor:openapi-processor-core-parser-openapi4j", version.ref = "base" }
1920

2021
checker = "org.checkerframework:checker:3.42.0"
2122
jimfs = "com.google.jimfs:jimfs:1.3.0"

src/main/kotlin/io/openapiprocessor/micronaut/processor/MicronautProcessor.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ import io.openapiprocessor.micronaut.Version
1515
import io.openapiprocessor.micronaut.writer.java.BeanValidations
1616
import io.openapiprocessor.micronaut.writer.java.MappingAnnotationWriter
1717
import io.openapiprocessor.micronaut.writer.java.ParameterAnnotationWriter
18+
import io.openapiprocessor.test.api.OpenApiProcessorTest
1819
import org.slf4j.Logger
1920
import org.slf4j.LoggerFactory
2021
import java.time.OffsetDateTime
2122

2223
/**
2324
* Entry point of openapi-processor-micronaut.
2425
*/
25-
class MicronautProcessor : io.openapiprocessor.api.v2.OpenApiProcessorTest {
26+
class MicronautProcessor : OpenApiProcessorTest {
2627
private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
2728
private var testMode = false
2829

src/main/kotlin/io/openapiprocessor/micronaut/processor/MicronautServiceV2.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package io.openapiprocessor.micronaut.processor
88
import io.openapiprocessor.api.v2.Version
99
import io.openapiprocessor.core.version.GitHubVersionException
1010
import io.openapiprocessor.core.version.GitHubVersionProvider
11+
import io.openapiprocessor.test.api.OpenApiProcessorTest
1112
import org.slf4j.Logger
1213
import org.slf4j.LoggerFactory
1314

@@ -23,7 +24,7 @@ class MicronautServiceV2(
2324
private val testMode: Boolean = false):
2425
io.openapiprocessor.api.v2.OpenApiProcessor,
2526
io.openapiprocessor.api.v2.OpenApiProcessorVersion,
26-
io.openapiprocessor.api.v2.OpenApiProcessorTest
27+
OpenApiProcessorTest
2728
{
2829
private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
2930

0 commit comments

Comments
 (0)