Skip to content

Update Project dependencies and Publishing #1873

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 28, 2025
Merged

Update Project dependencies and Publishing #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8d8ca2
build(deps): remove incorrect `grails-core` API dependency
matrei Jan 28, 2025
1d325e3
build(deps): set correct `grails-core` `testImplementation` dependencies
matrei Jan 28, 2025
d8b16d4
build: add `sourcesJar` and `javadocJar` tasks
matrei Jan 28, 2025
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
18 changes: 17 additions & 1 deletion gradle/publish-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import org.grails.gradle.plugin.publishing.GrailsPublishExtension

apply plugin: 'org.grails.grails-publish'

project.extensions.configure(GrailsPublishExtension) {
extensions.configure(GrailsPublishExtension) {
// Explicit `it` is required here
it.githubSlug = 'grails/grails-data-mapping'
it.license.name = 'Apache-2.0'
it.title = findProperty('pomTitle') ?: 'Grails GORM'
Expand All @@ -16,3 +17,18 @@ project.extensions.configure(GrailsPublishExtension) {
'jamesfredley': 'James Fredley'
]
}

// Add sources and javadoc jar tasks
// java.withSourcesJar() and java.withJavadocJar() is not compatible here with GrailsPublishPlugin
if (!tasks.findByName('sourcesJar')) {
tasks.register('sourcesJar', Jar) {
archiveClassifier = 'sources'
from sourceSets.main.allSource
}
}
if (!tasks.findByName('javadocJar')) {
tasks.register('javadocJar', Jar) {
archiveClassifier = 'javadoc'
from javadoc.destinationDir
}
}
2 changes: 1 addition & 1 deletion grails-datastore-gorm-tck/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
}

implementation 'org.grails:grails-core', {
// impl: ValidationException
// impl: Entity, ValidationException
if (excludeUnusedTransDeps) {
// API dependencies in grails-core
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
Expand Down
9 changes: 3 additions & 6 deletions grails-datastore-gorm-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,11 @@ dependencies {
// api: SelectClasses, Suite
}
testImplementation project(':grails-datastore-gorm-tck')
/*
testCompileOnly 'org.grails:grails-core', {
// api: Entity
// impl: ValidationException
testImplementation 'org.grails:grails-core', {
// impl: Entity. ValidationException
if (excludeUnusedTransDeps) {
// API dependencies in grails-core
//exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' // PostConstruct
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
//exclude group: 'org.grails', module: 'grails-bootstrap' // Resource
Expand All @@ -82,7 +80,6 @@ dependencies {
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
}
}
*/
testImplementation 'org.spockframework:spock-core'

// Commented out since we aren't building / publishing
Expand Down
18 changes: 0 additions & 18 deletions grails-datastore-gorm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,6 @@ dependencies {
api 'jakarta.persistence:jakarta.persistence-api', {
// api: FetchType, JoinType
}
api 'org.grails:grails-core', {
// ast: grails.persistence.Entity
if (excludeUnusedTransDeps) {
// API dependencies in grails-core
exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api'
exclude group: 'jakarta.inject', module: 'jakarta.inject-api'
exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
//exclude group: 'org.grails', module: 'grails-bootstrap' // Resource
exclude group: 'org.grails', module: 'grails-datastore-core'
exclude group: 'org.grails', module: 'grails-spring'
exclude group: 'org.springframework', module: 'spring-beans'
exclude group: 'org.springframework', module: 'spring-context'
exclude group: 'org.springframework', module: 'spring-core'
exclude group: 'org.springframework', module: 'spring-tx'
exclude group: 'org.springframework.boot', module: 'spring-boot'
exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
}
}
api 'org.springframework:spring-context', {
// api: Validator
}
Expand Down
Loading