Skip to content

Commit 918203c

Browse files
authored
Merge pull request #251 from graphql-java/copilot/upgrade-gradle-wrapper-version
2 parents 4ade908 + 3925883 commit 918203c

File tree

5 files changed

+65
-43
lines changed

5 files changed

+65
-43
lines changed

build.gradle

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
id 'maven-publish'
1212
id 'signing'
1313
id 'groovy'
14-
id 'biz.aQute.bnd.builder' version '6.2.0'
14+
id 'biz.aQute.bnd.builder' version '7.1.0'
1515
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
1616
id 'com.github.ben-manes.versions' version '0.53.0'
1717
id "me.champeau.jmh" version "0.7.3"
@@ -81,13 +81,15 @@ repositories {
8181

8282
jar {
8383
manifest {
84-
attributes('Automatic-Module-Name': 'org.dataloader',
85-
'-exportcontents': 'org.dataloader.*',
86-
'-removeheaders': 'Private-Package')
84+
attributes('Automatic-Module-Name': 'org.dataloader')
8785
}
88-
bnd('''
86+
bundle {
87+
bnd('''
88+
-exportcontents: org.dataloader.*
89+
-removeheaders: Private-Package
8990
Import-Package: org.jspecify.annotations;resolution:=optional,*
9091
''')
92+
}
9193
}
9294

9395
dependencies {
@@ -141,10 +143,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
141143
from javadoc.destinationDir
142144
}
143145

144-
artifacts {
145-
archives sourcesJar
146-
archives javadocJar
147-
}
146+
148147

149148
testing {
150149
suites {
@@ -177,9 +176,9 @@ publishing {
177176
publications {
178177
graphqlJava(MavenPublication) {
179178
from components.java
180-
groupId 'com.graphql-java'
181-
artifactId 'java-dataloader'
182-
version project.version
179+
groupId = 'com.graphql-java'
180+
artifactId = 'java-dataloader'
181+
version = project.version
183182

184183
artifact sourcesJar
185184
artifact javadocJar
@@ -237,7 +236,7 @@ nexusPublishing {
237236
}
238237

239238
signing {
240-
required { !project.hasProperty('publishToMavenLocal') }
239+
required = { !project.hasProperty('publishToMavenLocal') }
241240
def signingKey = System.env.MAVEN_CENTRAL_PGP_KEY
242241
useInMemoryPgpKeys(signingKey, "")
243242
sign publishing.publications

gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 31 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 21 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)