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.

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

Jump to bottom

Backport a fix of 'Add explicit automatic module name configuration' #1236

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Backport a fix of 'Add explicit automatic module name configuration' #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions bson-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,5 @@ tasks.javadocJar.configure {
// Sources publishing configuration
// ===========================
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }

afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.bson.kotlin" } } }
2 changes: 2 additions & 0 deletions bson-kotlinx/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,5 @@ tasks.javadocJar.configure {
// Sources publishing configuration
// ===========================
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }

afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.bson.kotlinx" } } }
11 changes: 7 additions & 4 deletions bson-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ test {
maxParallelForks = 1
}

jar.manifest.attributes['Import-Package'] = [
'!scala.*',
'*'
].join(',')
afterEvaluate {
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.bson.scala'
jar.manifest.attributes['Import-Package'] = [
'!scala.*',
'*'
].join(',')
}
5 changes: 4 additions & 1 deletion bson/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ ext {
pomURL = 'https://bsonspec.org'
}

jar.manifest.attributes['Import-Package'] = 'org.slf4j.*;resolution:=optional'
afterEvaluate {
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.bson'
jar.manifest.attributes['Import-Package'] = 'org.slf4j.*;resolution:=optional'
}
2 changes: 2 additions & 0 deletions driver-kotlin-coroutine/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,5 @@ tasks.javadocJar.configure {
// Sources publishing configuration
// ===========================
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }

afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.coroutine" } } }
2 changes: 2 additions & 0 deletions driver-kotlin-sync/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,5 @@ tasks.javadocJar.configure {
// Sources publishing configuration
// ===========================
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }

afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.sync" } } }
2 changes: 1 addition & 1 deletion driver-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ ext {
}

afterEvaluate {
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.scala.mongo-scala-driver'
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.driver.scala'
jar.manifest.attributes['Import-Package'] = [
'!scala.*',
'*'
Expand Down
1 change: 0 additions & 1 deletion gradle/publish.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ ext {
configureJarManifestAttributes = { project ->
{ ->
manifest.attributes['-exportcontents'] = "*;-noimport:=true"
manifest.attributes['Automatic-Module-Name'] = project.group + '.' + project.archivesBaseName
manifest.attributes['Build-Version'] = project.gitVersion
manifest.attributes['Bundle-Version'] = project.version
manifest.attributes['Bundle-Name'] = project.archivesBaseName
Expand Down