Skip to content

Commit

Permalink
build: remove version catalog usage (#1053)
Browse files Browse the repository at this point in the history
  • Loading branch information
@matrei
matrei authored Feb 12, 2025
1 parent 2e73201 commit ebb5782
Show file tree
Hide file tree
Showing 12 changed files with 161 additions and 225 deletions.
6 changes: 1 addition & 5 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {
}

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

Expand All @@ -31,16 +30,13 @@ subprojects {
repositories {
mavenCentral()
maven { url = 'https://repo.grails.org/grails/core' }
if (libs.versions.groovy.get().endsWith('-SNAPSHOT')) {
if (groovyVersion.endsWith('-SNAPSHOT')) {
maven {
name = 'JFrog Groovy snapshot repo'
url = 'https://groovy.jfrog.io/artifactory/libs-snapshot-local'
}
}
}
dependencies {
implementation platform(libs.grails.bom)
}
}

// Do not generate extra load on Nexus with new staging repository if signing fails
Expand Down
23 changes: 14 additions & 9 deletions buildSrc/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
plugins {
id 'groovy-gradle-plugin'
}

Properties versions = new Properties()
file('../gradle.properties').withInputStream {
versions.load(it)
}

repositories {
mavenCentral()
maven { url = 'https://repo.grails.org/grails/core' }
}

dependencies {
implementation platform(buildsrcLibs.grails.bom)
implementation buildsrcLibs.asciidoctorj
implementation buildsrcLibs.asset.pipeline.gradle
implementation buildsrcLibs.grails.gradle.plugin, {
// Grails Gradle plugin leaks groovy-xml onto compile classpath
// which is causes a version conflict for Gradle
exclude group: 'org.apache.groovy', module: 'groovy-xml'
}
testImplementation buildsrcLibs.spock.core
implementation platform("org.grails:grails-bom:${versions.get('grailsVersion')}")
implementation "org.asciidoctor:asciidoctor-gradle-jvm:${versions.get('asciidoctorGradlePluginVersion')}"
implementation "com.bertramlabs.plugins:asset-pipeline-gradle:${versions.get('assetPipelineGradlePluginVersion')}"
implementation 'org.grails:grails-gradle-plugin'
testImplementation 'org.spockframework:spock-core'
}

tasks.withType(Test).configureEach {
Expand Down
7 changes: 0 additions & 7 deletions buildSrc/settings.gradle
View file

This file was deleted.

53 changes: 27 additions & 26 deletions examples/functional-test-app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,36 @@ group = 'examples.test'

dependencies {

implementation project(':spring-security-core')
implementation platform("org.grails:grails-bom:$grailsVersion")

implementation libs.grails.core
implementation libs.grails.datastore.core
implementation libs.grails.datastore.gorm
implementation libs.grails.events.transform
implementation libs.grails.gsp
implementation libs.grails.rest
implementation libs.grails.validation
implementation libs.groovy.core
implementation libs.spring.security.core
implementation libs.spring.web
implementation project(':spring-security-core')
implementation 'org.grails:grails-core'
implementation 'org.grails:grails-datastore-core'
implementation 'org.grails:grails-datastore-gorm'
implementation "org.grails:grails-events-transform:$grailsAsyncVersion" // Not yet in the milestone bom
implementation 'org.grails.plugins:gsp'
implementation 'org.grails:grails-plugin-rest'
implementation 'org.grails:grails-plugin-validation'
implementation 'org.apache.groovy:groovy'
implementation 'org.springframework.security:spring-security-core'
implementation 'org.springframework:spring-web'

runtimeOnly libs.micronaut.jackson.databind
runtimeOnly libs.gorm.hibernate5
runtimeOnly libs.grails.asset.pipeline
runtimeOnly libs.grails.i18n
runtimeOnly libs.grails.interceptors
runtimeOnly libs.grails.services
runtimeOnly libs.grails.urlmappings
runtimeOnly libs.springboot.autoconfigure
runtimeOnly libs.springboot.starter.logging
runtimeOnly libs.springboot.starter.tomcat
runtimeOnly libs.h2database
runtimeOnly libs.tomcat.jdbc
runtimeOnly "io.micronaut:micronaut-jackson-databind:$micronautVersion"
runtimeOnly 'org.grails.plugins:hibernate5'
runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
runtimeOnly 'org.grails:grails-plugin-i18n'
runtimeOnly 'org.grails:grails-plugin-interceptors'
runtimeOnly 'org.grails:grails-plugin-services'
runtimeOnly 'org.grails:grails-plugin-url-mappings'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'

compileOnly libs.jakarta.annotation.api
compileOnly libs.jakarta.servlet.api
compileOnly libs.slf4j.nop // Prevent warnings about missing SLF4j implementation during GSP compilation
compileOnly 'jakarta.annotation:jakarta.annotation-api'
compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop' // Prevent warnings about missing SLF4j implementation during GSP compilation
}

apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
Expand Down
59 changes: 31 additions & 28 deletions examples/integration-test-app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,38 @@ group = 'misc.integration.test.app'

dependencies {

implementation project(':spring-security-core')
implementation platform("org.grails:grails-bom:$grailsVersion")

implementation libs.grails.core
implementation libs.grails.datastore.gorm
implementation libs.grails.domain
implementation libs.groovy.core
implementation libs.spring.security.core
implementation libs.spring.security.crypto
implementation libs.spring.security.web
implementation libs.spring.web
implementation libs.springboot.autoconfigure

runtimeOnly libs.gorm.hibernate5
runtimeOnly libs.grails.i18n
runtimeOnly libs.grails.interceptors
runtimeOnly libs.grails.services
runtimeOnly libs.grails.urlmappings
runtimeOnly libs.grails.web.common
runtimeOnly libs.h2database
runtimeOnly libs.springboot.starter.logging
runtimeOnly libs.springboot.starter.tomcat
runtimeOnly libs.tomcat.jdbc

compileOnly libs.jakarta.servlet.api
compileOnly libs.slf4j.nop

testImplementation libs.spock.core
testImplementation libs.spring.tx
testImplementation libs.bundles.grails.testing.support
implementation project(':spring-security-core')
implementation 'org.grails:grails-core'
implementation 'org.grails:grails-datastore-gorm'
implementation 'org.grails:grails-plugin-domain-class'
implementation 'org.apache.groovy:groovy'
implementation 'org.springframework.security:spring-security-core'
implementation 'org.springframework.security:spring-security-crypto'
implementation 'org.springframework.security:spring-security-web'
implementation 'org.springframework:spring-web'
implementation 'org.springframework.boot:spring-boot-autoconfigure'

runtimeOnly 'org.grails.plugins:hibernate5'
runtimeOnly 'org.grails:grails-plugin-i18n'
runtimeOnly 'org.grails:grails-plugin-interceptors'
runtimeOnly 'org.grails:grails-plugin-services'
runtimeOnly 'org.grails:grails-plugin-url-mappings'
runtimeOnly 'org.grails:grails-web-common'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'

compileOnly 'jakarta.servlet:jakarta.servlet-api'
compileOnly 'org.slf4j:slf4j-nop'

testImplementation 'org.spockframework:spock-core'
testImplementation 'org.springframework:spring-tx'
testImplementation 'org.grails:grails-gorm-testing-support'
testImplementation 'org.grails:grails-web-testing-support'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
Expand Down
36 changes: 18 additions & 18 deletions examples/misc-functional-test-app/grails-spring-security-group/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ dependencies {

implementation project(':spring-security-core')

implementation libs.grails.core
implementation libs.grails.datastore.core
implementation libs.grails.datastore.gorm
implementation libs.grails.events.transform
implementation libs.grails.rest
implementation libs.groovy.core
implementation libs.spring.beans
implementation 'org.grails:grails-core'
implementation 'org.grails:grails-datastore-core'
implementation 'org.grails:grails-datastore-gorm'
implementation "org.grails:grails-events-transform:$grailsAsyncVersion" // Not yet in the milestone bom
implementation 'org.grails:grails-plugin-rest'
implementation 'org.apache.groovy:groovy'
implementation 'org.springframework:spring-beans'

runtimeOnly libs.gorm.hibernate5
runtimeOnly libs.grails.gsp
runtimeOnly libs.grails.i18n
runtimeOnly libs.grails.interceptors
runtimeOnly libs.grails.services
runtimeOnly libs.grails.urlmappings
runtimeOnly libs.springboot.autoconfigure
runtimeOnly libs.springboot.starter.logging
runtimeOnly libs.springboot.starter.tomcat
runtimeOnly libs.h2database
runtimeOnly libs.tomcat.jdbc
runtimeOnly 'org.grails.plugins:hibernate5'
runtimeOnly 'org.grails.plugins:gsp'
runtimeOnly 'org.grails:grails-plugin-i18n'
runtimeOnly 'org.grails:grails-plugin-interceptors'
runtimeOnly 'org.grails:grails-plugin-services'
runtimeOnly 'org.grails:grails-plugin-url-mappings'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
}

apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
Expand Down
32 changes: 16 additions & 16 deletions examples/misc-functional-test-app/grails-spring-security-hierarchical-roles/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ dependencies {

implementation project(':spring-security-core')

implementation libs.grails.core
implementation libs.grails.datastore.core
implementation libs.grails.datastore.gorm
implementation libs.grails.domain
implementation libs.grails.events.transform
implementation libs.grails.rest
implementation libs.groovy.core
implementation libs.spring.beans
implementation 'org.grails:grails-core'
implementation 'org.grails:grails-datastore-core'
implementation 'org.grails:grails-datastore-gorm'
implementation 'org.grails:grails-plugin-domain-class'
implementation "org.grails:grails-events-transform:$grailsAsyncVersion" // Not yet in the milestone bom
implementation 'org.grails:grails-plugin-rest'
implementation 'org.apache.groovy:groovy'
implementation 'org.springframework:spring-beans'

runtimeOnly libs.gorm.hibernate5
runtimeOnly libs.grails.services
runtimeOnly libs.grails.urlmappings
runtimeOnly libs.h2database
runtimeOnly libs.springboot.autoconfigure
runtimeOnly libs.springboot.starter.logging
runtimeOnly libs.springboot.starter.tomcat
runtimeOnly libs.tomcat.jdbc
runtimeOnly 'org.grails.plugins:hibernate5'
runtimeOnly 'org.grails:grails-plugin-services'
runtimeOnly 'org.grails:grails-plugin-url-mappings'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.springframework.boot:spring-boot-autoconfigure'
runtimeOnly 'org.springframework.boot:spring-boot-starter-logging'
runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
}

apply from: rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
Expand Down
10 changes: 10 additions & 0 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
projectVersion=7.0.0-SNAPSHOT
grailsVersion=7.0.0-M1

# Refactor to use the version from the BOM
groovyVersion=4.0.24
assetPipelineGradlePluginVersion=5.0.5

grailsAsyncVersion=6.0.0-M2
micronautVersion=4.5.3

asciidoctorGradlePluginVersion=4.0.4

# This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
# https://github.com/grails/grails-gradle-plugin/issues/222
Expand Down
13 changes: 0 additions & 13 deletions gradle/buildsrc.libs.versions.toml
View file

This file was deleted.

8 changes: 5 additions & 3 deletions gradle/integrationTest.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
dependencies {
add('testImplementation', libs.micronaut.httpclient)
add('testImplementation', libs.bundles.grails.testing.support)
add('testImplementation', "io.micronaut:micronaut-http-client:$micronautVersion")
add('testImplementation', 'org.grails:grails-gorm-testing-support')
add('testImplementation', 'org.grails:grails-web-testing-support')
add('testImplementation', 'org.springframework.boot:spring-boot-starter-test')

integrationTestImplementation testFixtures(libs.geb.plugin)
add('integrationTestImplementation', testFixtures('org.grails.plugins:geb'))
}

tasks.named('integrationTest', Test) {
Expand Down
65 changes: 0 additions & 65 deletions gradle/libs.versions.toml
View file

This file was deleted.

Loading

0 comments on commit ebb5782

Please sign in to comment.