Skip to content

Commit 877e2e9

Browse files
committed
Upgrade to Gradle 8.14.3 and Java 21
1 parent 97a63ac commit 877e2e9

File tree

43 files changed

+259
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+259
-176
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ gradle-app.setting
2727

2828
# Demo data sets
2929
yelp_json
30-
yelp_graph
30+
yelp_graph

build.gradle

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java-library'
3-
id 'com.github.hierynomus.license' version '0.16.2-37dde1f' apply false
4-
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
3+
id 'com.github.hierynomus.license' version '0.16.3-63da64d' apply false
4+
id 'com.gradleup.shadow' version '9.2.2' apply false
55
id 'com.github.alisiikh.scalastyle' version '3.5.0' apply false
66
id 'me.champeau.jmh' version '0.7.3' apply false
77
id "ch.kk7.spawn" version "1.0.20180924200750" apply false
@@ -11,6 +11,11 @@ apply from: 'build.params.gradle'
1111
apply plugin: 'base'
1212

1313
allprojects {
14+
java {
15+
sourceCompatibility = ver.jvm
16+
targetCompatibility = ver.jvm
17+
}
18+
1419
group = 'org.opencypher'
1520
version = ver.self
1621
}
@@ -49,7 +54,7 @@ subprojects {
4954
}
5055

5156
ext.scalacParameters = [
52-
"-target:jvm-$ver.jvm".toString(),
57+
"-release:${ver.jvm}".toString(),
5358
'-unchecked',
5459
'-deprecation',
5560
'-feature',
@@ -69,18 +74,18 @@ subprojects {
6974
}
7075

7176
task sourceJar(type: Jar) {
72-
classifier = 'sources'
77+
archiveClassifier = 'sources'
7378
from(sourceSets.main.allSource)
7479
}
7580

7681
task docJar(type: Jar) {
7782
dependsOn tasks.scaladoc
78-
classifier = 'javadoc'
83+
archiveClassifier = 'javadoc'
7984
from(tasks.scaladoc.destinationDir)
8085
}
8186

8287
task testJar(type: Jar) {
83-
classifier = 'tests'
88+
archiveClassifier = 'tests'
8489
from(sourceSets.test.output)
8590
}
8691

@@ -95,14 +100,14 @@ subprojects {
95100
}
96101

97102
task dependencySearch(type: DependencyInsightReportTask) {
98-
description 'Searches all projects for a dependency'
99-
group 'help'
103+
description = 'Searches all projects for a dependency'
104+
group = 'help'
100105
}
101106

102107
task runApp {
103108
dependsOn tasks.classes
104-
group 'run'
105-
description 'Run a custom Scala app (use -PmainClass=com.my.package.App)'
109+
group = 'run'
110+
description = 'Run a custom Scala app (use -PmainClass=com.my.package.App)'
106111
doLast {
107112
javaexec {
108113
classpath = sourceSets.main.runtimeClasspath
@@ -113,7 +118,7 @@ subprojects {
113118

114119
// copied from https://stackoverflow.com/a/38058671/568723
115120
task depSize {
116-
description 'Lists all dependencies sorted by their size'
121+
description = 'Lists all dependencies sorted by their size'
117122
doLast {
118123
final formatStr = "%,10.2f"
119124
final conf = configurations.default

build.licenses.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def allowList = [
4848
]]
4949
]
5050

51-
// Adapted from https://github.com/neo4j/graph-data-science/blob/2.13/gradle/licensing.gradle
51+
// Adapted from https://github.com/neo4j/graph-data-science/blob/0684425ee000d2d5a13049ff1bf097075825cbe3/gradle/licensing.gradle
5252
subprojects { proj ->
5353
plugins.withType(JavaLibraryPlugin) {
5454
proj.apply plugin: 'com.github.hierynomus.license'
@@ -63,7 +63,6 @@ subprojects { proj ->
6363
// exclude 'test/resources/**'
6464
// exclude 'main/resources/**'
6565
include '**/*.java'
66-
include '**/*.scala'
6766
}
6867
tasks.check.dependsOn tasks.license
6968

@@ -91,8 +90,8 @@ subprojects { proj ->
9190

9291
// Dependency license validation
9392
tasks.register("validateLicenses") {
94-
group 'license'
95-
description 'Checks dependency licenses against an allowlist'
93+
group = 'license'
94+
description = 'Checks dependency licenses against an allowlist'
9695
dependsOn tasks.downloadLicenses
9796
doLast {
9897
def allowListedNames = allowList.collect { it.name }
@@ -106,7 +105,7 @@ subprojects { proj ->
106105

107106
// Compound dependency licenses files
108107
tasks.register("generateLicensesFiles") {
109-
description 'Generates dependency license report files'
108+
description = 'Generates dependency license report files'
110109
dependsOn tasks.downloadLicenses, tasks.validateLicenses
111110
ext.licensesFile = file("$tasks.downloadLicenses.jsonDestination/LICENSES.txt")
112111
ext.noticeFile = file("$tasks.downloadLicenses.jsonDestination/NOTICE.txt")

build.params.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ext {
77
ver = [
88
self : '0.4.3-SNAPSHOT',
99

10-
jvm : '1.8',
10+
jvm : '17',
1111

1212
scala : [major: '2.12',
1313
full : '2.12.20'],

build.publishing.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ subprojects {
8787
if (project.name != "okapi-shade") {
8888
// Convenience for quick publish to maven local
8989
task devPublish {
90-
group 'publishing'
91-
description ' Publishes main jars to the local Maven repository.'
90+
group = 'publishing'
91+
description = ' Publishes main jars to the local Maven repository.'
9292
dependsOn tasks.publishDevPublicationToMavenLocal
9393
}
9494
}

dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/0.16.2-37dde1f/com.github.hierynomus.license.gradle.plugin-0.16.2-37dde1f.pom.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/0.16.2-37dde1f/com.github.hierynomus.license.gradle.plugin-0.16.2-37dde1f.pom.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/0.16.2-37dde1f/com.github.hierynomus.license.gradle.plugin-0.16.2-37dde1f.pom.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/0.16.2-37dde1f/com.github.hierynomus.license.gradle.plugin-0.16.2-37dde1f.pom.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/0.16.2-37dde1f/com.github.hierynomus.license.gradle.plugin-0.16.2-37dde1f.pom renamed to dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/0.16.3-63da64d/com.github.hierynomus.license.gradle.plugin-0.16.3-63da64d.pom

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.github.hierynomus.license</groupId>
55
<artifactId>com.github.hierynomus.license.gradle.plugin</artifactId>
6-
<version>0.16.2-37dde1f</version>
6+
<version>0.16.3-63da64d</version>
77
<packaging>pom</packaging>
8+
<name>License plugin for Gradle</name>
9+
<description>Applies a header to files, typically a license</description>
810
<dependencies>
911
<dependency>
1012
<groupId>com.hierynomus.gradle.plugins</groupId>
1113
<artifactId>license-gradle-plugin</artifactId>
12-
<version>0.16.2-37dde1f</version>
14+
<version>0.16.3-63da64d</version>
1315
</dependency>
1416
</dependencies>
1517
</project>

0 commit comments

Comments
 (0)