Skip to content
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 @@ -7,6 +7,11 @@ micronautBuild {
enableBom = false
}

// Apply BOM to resolve micronaut-module-info version added by Micronaut 5 build plugin
dependencies {
compileOnly platform(mn.micronaut.core.bom)
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sdelamo could you confirm please

configurations {
documentation
}
Expand All @@ -15,7 +20,6 @@ dependencies {
documentation libs.javaparser

testImplementation mn.micronaut.runtime
testImplementation libs.groovy.test
}

groovydoc {
Expand Down
6 changes: 6 additions & 0 deletions function-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ plugins {
id 'io.micronaut.build.internal.groovy-module'
}

micronautBuild {
descriptor {
parentModuleId = "io.micronaut.groovy:micronaut-function-groovy"
}
}

dependencies {
compileOnly mn.micronaut.inject.groovy

Expand Down
8 changes: 1 addition & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
[versions]
javaparser = '3.27.1'
micronaut-docs = "3.0.0"
micronaut = "4.10.12"
micronaut-test = "4.10.1"
groovy = "4.0.18"
spock = "2.3-groovy-4.0"
Comment on lines -6 to -7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can keep using groovy version from catalog.
groovy = "5.0.3"
spock = "2.4-groovy-5.0"

micronaut = "5.0.0-M8"

[libraries]
# Core
micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' }

javaparser = { module = 'com.github.javaparser:javaparser-core', version.ref = 'javaparser' }

groovy-test = { module = 'org.apache.groovy:groovy-test', version = '' }
2 changes: 1 addition & 1 deletion groovy-bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
api platform("org.apache.groovy:groovy-bom:${libs.versions.groovy.get()}")
api platform("org.apache.groovy:groovy-bom:${mn.versions.groovy.get()}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can keep using groovy version from catalog.
groovy = "5.0.3"
spock = "2.4-groovy-5.0"

}

micronautBom {
Expand Down
6 changes: 6 additions & 0 deletions runtime-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ plugins {
id 'io.micronaut.build.internal.groovy-module'
}

micronautBuild {
descriptor {
parentModuleId = "io.micronaut.groovy:micronaut-runtime-groovy"
}
}

dependencies {
api mn.groovy

Expand Down
Loading