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

Use dependency versions from the grails-bom where available #57

Merged
merged 13 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from 10 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
28 changes: 16 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

version = projectVersion
group = 'org.grails.plugins'
ext.set('grailsVersion', libs.versions.grails.asProvider().get())
ext.set('grailsVersion', libs.versions.grails.get())
ext.set('isReleaseVersion', !version.toString().endsWith('-SNAPSHOT'))
ext.set('isSnapshot', !isReleaseVersion)

Expand All @@ -21,11 +21,14 @@ repositories {

dependencies {

compileOnly libs.grails.core // Used in public api, but provided
compileOnly libs.groovy.core // Used in public api, but provided
compileOnly libs.servlet.api // Provided
implementation(platform(libs.grails.bom))

compileOnly libs.servlet.api // Provided by the servlet container
compileOnly libs.grails.core // Provided as this is a Grails plugin
compileOnly libs.groovy.core // Used in public api, but Groovy is always provided

compileOnlyApi libs.javamail.api // Used in public api

api libs.javamail.api // Used in public api
api libs.spring.context // Used in public api
api libs.spring.context.support // Used in public api

Expand All @@ -36,28 +39,29 @@ dependencies {
implementation libs.grails.gsp
implementation libs.grails.web.common

implementation libs.javamail.impl // Needs to be implementation (not runtimeOnly), as SMTPMessage is used in MailMessageBuilder
implementation libs.springboot.autoconfigure
matrei marked this conversation as resolved.
Show resolved Hide resolved
implementation libs.grails.web.urlmappings
implementation libs.javamail.impl
implementation libs.spring.beans
implementation libs.springboot.autoconfigure

testImplementation libs.grails.testing.support.core
testRuntimeOnly libs.slf4j.simple

testImplementation libs.servlet.api
testImplementation libs.grails.testing.support.core
testImplementation libs.spock.core

integrationTestImplementation libs.groovy.xml
integrationTestImplementation libs.greenmail
integrationTestImplementation libs.groovy.xml
integrationTestImplementation libs.spring.web

integrationTestRuntimeOnly libs.grails.testing.support.web
integrationTestRuntimeOnly libs.slf4j.nop // Get rid of warning about missing slf4j implementation during test task
integrationTestRuntimeOnly libs.springboot.starter.tomcat
matrei marked this conversation as resolved.
Show resolved Hide resolved
integrationTestRuntimeOnly libs.grails.testing.support.web
}

tasks.withType(Test).configureEach {
useJUnitPlatform()
testLogging {
events 'passed', 'skipped', 'failed'
events 'passed', 'skipped', 'failed', 'standardError', 'standardOut'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/documentation-config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

add('guideConfiguration', libs.grails.docs)
add('guideConfiguration', libs.groovy.templates)
add('guideConfiguration', libs.slf4j.nop) // Get rid of warning about missing slf4j implementation during docs task
add('guideConfiguration', libs.slf4j.nop) // Get rid of logs during guide generation
}

tasks.withType(Groovydoc).configureEach {
Expand Down
39 changes: 18 additions & 21 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
[versions]
grails = '7.0.0-SNAPSHOT'
grails-testing-support = '4.0.0-SNAPSHOT'
greenmail = '2.0.1'
groovy = '4.0.23'
gsp = '7.0.0-SNAPSHOT'
javamail = '2.0.1'
servlet-api = '6.0.0'
matrei marked this conversation as resolved.
Show resolved Hide resolved
slf4j = '1.7.36'
spring = '6.1.13'
slf4j = '2.0.16'
springboot = '3.3.4'
spock = '2.3-groovy-4.0'

[libraries]
grails-core = { module = 'org.grails:grails-core', version.ref = 'grails' }
grails-gsp = { module = 'org.grails:grails-gsp', version.ref = 'gsp' }
grails-testing-support-core = { module = 'org.grails:grails-testing-support', version.ref = 'grails-testing-support' }
grails-testing-support-web = { module = 'org.grails:grails-web-testing-support', version.ref = 'grails-testing-support' }
grails-web-common = { module = 'org.grails:grails-web-common', version.ref = 'grails' }
grails-web-urlmappings = { module = 'org.grails:grails-web-url-mappings', version.ref = 'grails' }
grails-bom = { module = 'org.grails:grails-bom', version.ref = 'grails' }
grails-core = { module = 'org.grails:grails-core' }
greenmail = { module = 'com.icegreen:greenmail', version.ref = 'greenmail' }
groovy-core = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' }
grails-docs = { module = 'org.grails:grails-docs', version.ref = 'grails' }
groovy-templates = { module = 'org.apache.groovy:groovy-templates', version.ref = 'groovy' }
groovy-xml = { module = 'org.apache.groovy:groovy-xml', version.ref = 'groovy' }
grails-docs = { module = 'org.grails:grails-docs' }
grails-gsp = { module = 'org.grails:grails-gsp' }
matrei marked this conversation as resolved.
Show resolved Hide resolved
grails-testing-support-core = { module = 'org.grails:grails-testing-support' }
grails-testing-support-web = { module = 'org.grails:grails-web-testing-support' }
grails-web-common = { module = 'org.grails:grails-web-common' }
grails-web-urlmappings = { module = 'org.grails:grails-web-url-mappings' }
groovy-core = { module = 'org.apache.groovy:groovy' }
groovy-templates = { module = 'org.apache.groovy:groovy-templates' }
groovy-xml = { module = 'org.apache.groovy:groovy-xml' }
servlet-api = { module = 'jakarta.servlet:jakarta.servlet-api', version.ref = 'servlet-api' }
javamail-api = { module = 'jakarta.mail:jakarta.mail-api', version.ref = 'javamail' }
javamail-impl = { module = 'com.sun.mail:jakarta.mail', version.ref = 'javamail' }
slf4j-nop = { module = 'org.slf4j:slf4j-nop', version.ref = 'slf4j' }
spring-beans = { module = 'org.springframework:spring-beans', version.ref = 'spring' }
spring-context = { module = 'org.springframework:spring-context', version.ref = 'spring' }
spring-context-support = { module = 'org.springframework:spring-context-support', version.ref = 'spring' }
spring-web = { module = 'org.springframework:spring-web', version.ref = 'spring' }
slf4j-simple = { module = 'org.slf4j:slf4j-simple', version.ref = 'slf4j' }
spock-core = { module = 'org.spockframework:spock-core' }
spring-beans = { module = 'org.springframework:spring-beans' }
spring-context = { module = 'org.springframework:spring-context' }
spring-context-support = { module = 'org.springframework:spring-context-support' }
spring-web = { module = 'org.springframework:spring-web' }
springboot-autoconfigure = { module = 'org.springframework.boot:spring-boot-autoconfigure', version.ref = 'springboot' }
springboot-starter-tomcat = { module = 'org.springframework.boot:spring-boot-starter-tomcat', version.ref = 'springboot' }
spock-core = { module = 'org.spockframework:spock-core', version.ref = 'spock' }
Loading
Loading