Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: use mn #460

Merged
merged 1 commit into from
Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ dependencies {
api libs.validation.api
api projects.micrometerCore

compileOnly libs.micronaut.management
compileOnly mn.micronaut.management

testAnnotationProcessor libs.micronaut.inject.java
testImplementation libs.micronaut.http.client
testImplementation libs.micronaut.inject.groovy
testImplementation libs.micronaut.management
testRuntimeOnly libs.micronaut.http.server.netty
testAnnotationProcessor mn.micronaut.inject.java
testImplementation mn.micronaut.http.client
testImplementation mn.micronaut.inject.groovy
testImplementation mn.micronaut.management
testRuntimeOnly mn.micronaut.http.server.netty
}
18 changes: 0 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,6 @@ micrometer-registry-signalfx = { module = 'io.micrometer:micrometer-registry-sig
micrometer-registry-stackdriver = { module = 'io.micrometer:micrometer-registry-stackdriver', version.ref = 'managed-micrometer' }
micrometer-registry-statsd = { module = 'io.micrometer:micrometer-registry-statsd', version.ref = 'managed-micrometer' }
micrometer-registry-wavefront = { module = 'io.micrometer:micrometer-registry-wavefront', version.ref = 'managed-micrometer' }
micronaut-aop = { module = 'io.micronaut:micronaut-aop', version.ref = 'micronaut' }
micronaut-cache-core = { module = 'io.micronaut.cache:micronaut-cache-core' }
micronaut-function-web = { module = 'io.micronaut:micronaut-function-web' }
micronaut-graal = { module = 'io.micronaut:micronaut-graal' }
micronaut-http-client = { module = 'io.micronaut:micronaut-http-client' }
micronaut-http-server-netty = { module = 'io.micronaut:micronaut-http-server-netty' }
micronaut-inject-groovy = { module = 'io.micronaut:micronaut-inject-groovy' }
micronaut-inject-groovy-test = { module = 'io.micronaut:micronaut-inject-groovy-test', version.ref = 'micronaut' }
micronaut-inject-java = { module = 'io.micronaut:micronaut-inject-java' }
micronaut-inject-java-test = { module = 'io.micronaut:micronaut-inject-java-test', version.ref = 'micronaut' }
micronaut-jdbc = { module = 'io.micronaut.sql:micronaut-jdbc' }
micronaut-management = { module = 'io.micronaut:micronaut-management' }
micronaut-rxjava2 = { module = 'io.micronaut.rxjava2:micronaut-rxjava2' }
netty-buffer = { module = 'io.netty:netty-buffer' }
netty-transport = { module = 'io.netty:netty-transport' }
netty-transport-native-epoll = { module = 'io.netty:netty-transport-native-epoll' }
netty-transport-native-kqueue = { module = 'io.netty:netty-transport-native-kqueue' }
r2dbc-pool = { module = 'io.r2dbc:r2dbc-pool' }
reactor-core = { module = 'io.projectreactor:reactor-core' }
reflections = { module = 'org.reflections:reflections', version.ref = 'reflections' }
validation-api = { module = 'javax.validation:validation-api', version.ref = 'validation' }
6 changes: 3 additions & 3 deletions micrometer-annotation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ plugins {
}

dependencies {
api libs.micronaut.aop
api mn.micronaut.aop

if (!JavaVersion.current().isJava9Compatible()) {
testImplementation files(Jvm.current().toolsJar)
}
testImplementation libs.micronaut.inject.java.test
testImplementation libs.micronaut.inject.groovy.test
testImplementation mn.micronaut.inject.java.test
testImplementation mn.micronaut.inject.groovy.test
}

tasks.withType(Test).configureEach {
Expand Down
53 changes: 27 additions & 26 deletions micrometer-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,40 @@ plugins {
}

dependencies {
annotationProcessor libs.micronaut.graal
annotationProcessor mn.micronaut.graal

compileOnly libs.cache.api
compileOnly mn.jcache
compileOnly libs.grpc.api
compileOnly libs.logback.classic
compileOnly libs.micronaut.cache.core
compileOnly libs.micronaut.http.server.netty
compileOnly libs.micronaut.jdbc
compileOnly libs.micronaut.management
compileOnly libs.netty.buffer
compileOnly mn.logback
compileOnly mn.micronaut.cache.core
compileOnly mn.micronaut.http.server.netty
compileOnly mn.micronaut.jdbc
compileOnly mn.micronaut.management
compileOnly mn.netty.buffer
compileOnly libs.netty.transport
compileOnly libs.netty.transport.native.epoll
compileOnly libs.netty.transport.native.kqueue
compileOnly libs.r2dbc.pool
compileOnly mn.netty.transport.native.epoll
compileOnly mn.netty.transport.native.kqueue
compileOnly mn.r2dbc.pool

implementation libs.reactor.core
implementation mn.reactor.core

testAnnotationProcessor libs.micronaut.inject.java
testAnnotationProcessor mn.micronaut.inject.java
testAnnotationProcessor projects.micrometerAnnotation
testImplementation libs.groovy.json
testImplementation mn.groovy.json
testImplementation libs.grpc.api
testImplementation libs.micronaut.function.web
testImplementation libs.micronaut.http.client
testImplementation libs.micronaut.http.server.netty
testImplementation libs.micronaut.inject.groovy
testImplementation libs.micronaut.jdbc
testImplementation libs.micronaut.management
testImplementation libs.micronaut.rxjava2
testImplementation libs.netty.buffer

testImplementation mn.micronaut.function.web
testImplementation mn.micronaut.http.client
testImplementation mn.micronaut.http.server.netty
testImplementation mn.micronaut.inject.groovy
testImplementation mn.micronaut.jdbc
testImplementation mn.micronaut.management
testImplementation mn.micronaut.rxjava2
testImplementation mn.netty.buffer
testImplementation libs.netty.transport
testImplementation libs.netty.transport.native.epoll
testImplementation libs.netty.transport.native.kqueue
testImplementation libs.r2dbc.pool
testImplementation mn.netty.transport.native.epoll
testImplementation mn.netty.transport.native.kqueue
testImplementation mn.r2dbc.pool
testImplementation libs.reflections
testRuntimeOnly libs.micronaut.http.server.netty
testRuntimeOnly mn.micronaut.http.server.netty
}
11 changes: 11 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,14 @@ include 'micrometer-registry-wavefront'
include 'test-suite:micronaut-serialization'

enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'

dependencyResolutionManagement {
repositories {
mavenCentral()
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
}
}

micronautBuild {
importMicronautCatalog()
}
24 changes: 12 additions & 12 deletions test-suite/micronaut-serialization/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ plugins {
}

dependencies {
annotationProcessor libs.micronaut.graal
annotationProcessor mn.micronaut.graal

testAnnotationProcessor libs.micronaut.inject.java
testAnnotationProcessor mn.micronaut.inject.java
testAnnotationProcessor projects.micrometerAnnotation
testImplementation libs.groovy.json
testImplementation mn.groovy.json
testImplementation libs.grpc.api
testImplementation libs.micronaut.function.web
testImplementation libs.micronaut.http.client
testImplementation libs.micronaut.http.server.netty
testImplementation libs.micronaut.inject.groovy
testImplementation libs.micronaut.management
testImplementation libs.netty.buffer
testImplementation mn.micronaut.function.web
testImplementation mn.micronaut.http.client
testImplementation mn.micronaut.http.server.netty
testImplementation mn.micronaut.inject.groovy
testImplementation mn.micronaut.management
testImplementation mn.netty.buffer
testImplementation libs.netty.transport
testImplementation libs.netty.transport.native.epoll
testImplementation libs.netty.transport.native.kqueue
testImplementation mn.netty.transport.native.epoll
testImplementation mn.netty.transport.native.kqueue
testImplementation projects.micrometerCore
testRuntimeOnly libs.micronaut.http.server.netty
testRuntimeOnly mn.micronaut.http.server.netty
}

configurations.all {
Expand Down