Skip to content

Commit 3914671

Browse files
loveleifloveleif
committed
Upgrade to Gradle 8.14.3
1 parent 97a63ac commit 3914671

File tree

162 files changed

+26411
-59
lines changed

Some content is hidden

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

162 files changed

+26411
-59
lines changed

‎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.3-63da64d/com.github.hierynomus.license.gradle.plugin-0.16.3-63da64d.pom‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.github.hierynomus.license</groupId>
5+
<artifactId>com.github.hierynomus.license.gradle.plugin</artifactId>
6+
<version>0.16.3-63da64d</version>
7+
<packaging>pom</packaging>
8+
<name>License plugin for Gradle</name>
9+
<description>Applies a header to files, typically a license</description>
10+
<dependencies>
11+
<dependency>
12+
<groupId>com.hierynomus.gradle.plugins</groupId>
13+
<artifactId>license-gradle-plugin</artifactId>
14+
<version>0.16.3-63da64d</version>
15+
</dependency>
16+
</dependencies>
17+
</project>

‎dependencies/plugins/repository/com/github/hierynomus/license/com.github.hierynomus.license.gradle.plugin/maven-metadata.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<groupId>com.github.hierynomus.license</groupId>
44
<artifactId>com.github.hierynomus.license.gradle.plugin</artifactId>
55
<versioning>
6-
<latest>0.16.2-37dde1f</latest>
7-
<release>0.16.2-37dde1f</release>
6+
<latest>0.16.3-63da64d</latest>
7+
<release>0.16.3-63da64d</release>
88
<versions>
99
<version>0.16.2-37dde1f</version>
10+
<version>0.16.3-63da64d</version>
1011
</versions>
11-
<lastUpdated>20220128142712</lastUpdated>
12+
<lastUpdated>20251015064240</lastUpdated>
1213
</versioning>
1314
</metadata>

‎dependencies/plugins/repository/com/hierynomus/gradle/plugins/license-gradle-plugin/0.16.3-63da64d/license-gradle-plugin-0.16.3-63da64d-javadoc.jar‎

105 KB
Binary file not shown.

‎dependencies/plugins/repository/com/hierynomus/gradle/plugins/license-gradle-plugin/0.16.3-63da64d/license-gradle-plugin-0.16.3-63da64d-sources.jar‎

91.3 KB
Binary file not shown.

‎dependencies/plugins/repository/com/hierynomus/gradle/plugins/license-gradle-plugin/0.16.3-63da64d/license-gradle-plugin-0.16.3-63da64d.jar‎

295 KB
Binary file not shown.

‎dependencies/plugins/repository/com/hierynomus/gradle/plugins/license-gradle-plugin/0.16.3-63da64d/license-gradle-plugin-0.16.3-63da64d.module‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"formatVersion": "1.1",
3+
"component": {
4+
"group": "com.hierynomus.gradle.plugins",
5+
"module": "license-gradle-plugin",
6+
"version": "0.16.3-63da64d",
7+
"attributes": {
8+
"org.gradle.status": "release"
9+
}
10+
},
11+
"createdBy": {
12+
"gradle": {
13+
"version": "9.1.0"
14+
}
15+
},
16+
"variants": [
17+
{
18+
"name": "apiElements",
19+
"attributes": {
20+
"org.gradle.category": "library",
21+
"org.gradle.dependency.bundling": "external",
22+
"org.gradle.jvm.version": 21,
23+
"org.gradle.libraryelements": "jar",
24+
"org.gradle.usage": "java-api"
25+
},
26+
"files": [
27+
{
28+
"name": "license-gradle-plugin-0.16.3-63da64d.jar",
29+
"url": "license-gradle-plugin-0.16.3-63da64d.jar",
30+
"size": 301590,
31+
"sha512": "874f54c6e18277ca683fa3dda3f1319341fadbad8f6fb883ad0789f9571a19f91dbdb3c977a08ffb8dc5c7960ba76ee212c2f0b0a24b3072b93c6bc952a49418",
32+
"sha256": "157a3cea8449c2cd5540acf66e3d94b52dc7035d3a58f1098d946145d066fece",
33+
"sha1": "aaf6d992a03b9b1d9fa103092743c5cac1d06551",
34+
"md5": "e51af946b04eba9ce30f91a58b90813e"
35+
}
36+
]
37+
},
38+
{
39+
"name": "runtimeElements",
40+
"attributes": {
41+
"org.gradle.category": "library",
42+
"org.gradle.dependency.bundling": "external",
43+
"org.gradle.jvm.version": 21,
44+
"org.gradle.libraryelements": "jar",
45+
"org.gradle.usage": "java-runtime"
46+
},
47+
"dependencies": [
48+
{
49+
"group": "org.codehaus.plexus",
50+
"module": "plexus-utils",
51+
"version": {
52+
"requires": "4.0.2"
53+
}
54+
},
55+
{
56+
"group": "com.mycila.xmltool",
57+
"module": "xmltool",
58+
"version": {
59+
"requires": "3.3"
60+
}
61+
},
62+
{
63+
"group": "com.mycila",
64+
"module": "license-maven-plugin",
65+
"version": {
66+
"requires": "3.0"
67+
},
68+
"excludes": [
69+
{
70+
"group": "org.apache.maven",
71+
"module": "maven-plugin-api"
72+
},
73+
{
74+
"group": "org.apache.maven",
75+
"module": "maven-project"
76+
}
77+
]
78+
}
79+
],
80+
"files": [
81+
{
82+
"name": "license-gradle-plugin-0.16.3-63da64d.jar",
83+
"url": "license-gradle-plugin-0.16.3-63da64d.jar",
84+
"size": 301590,
85+
"sha512": "874f54c6e18277ca683fa3dda3f1319341fadbad8f6fb883ad0789f9571a19f91dbdb3c977a08ffb8dc5c7960ba76ee212c2f0b0a24b3072b93c6bc952a49418",
86+
"sha256": "157a3cea8449c2cd5540acf66e3d94b52dc7035d3a58f1098d946145d066fece",
87+
"sha1": "aaf6d992a03b9b1d9fa103092743c5cac1d06551",
88+
"md5": "e51af946b04eba9ce30f91a58b90813e"
89+
}
90+
]
91+
},
92+
{
93+
"name": "javadocElements",
94+
"attributes": {
95+
"org.gradle.category": "documentation",
96+
"org.gradle.dependency.bundling": "external",
97+
"org.gradle.docstype": "javadoc",
98+
"org.gradle.usage": "java-runtime"
99+
},
100+
"files": [
101+
{
102+
"name": "license-gradle-plugin-0.16.3-63da64d-javadoc.jar",
103+
"url": "license-gradle-plugin-0.16.3-63da64d-javadoc.jar",
104+
"size": 107759,
105+
"sha512": "5932cb767cc76071e998eec7fa4a093577eb1691fd881190ced5438bab51ab12c5904b1529d1266babfdddc70646e374c37a813e161037a87746942508345ce9",
106+
"sha256": "bc0cbe7642d4972cd0bf564ef4fbfcf77a76c3b1b0bcbd4be1b4f3078af9c5dc",
107+
"sha1": "5999c9776d1060194adf6eb7a53a8ecc08be5520",
108+
"md5": "39101543eac3ec37a79129cf20727985"
109+
}
110+
]
111+
},
112+
{
113+
"name": "sourcesElements",
114+
"attributes": {
115+
"org.gradle.category": "documentation",
116+
"org.gradle.dependency.bundling": "external",
117+
"org.gradle.docstype": "sources",
118+
"org.gradle.usage": "java-runtime"
119+
},
120+
"files": [
121+
{
122+
"name": "license-gradle-plugin-0.16.3-63da64d-sources.jar",
123+
"url": "license-gradle-plugin-0.16.3-63da64d-sources.jar",
124+
"size": 93499,
125+
"sha512": "b13b37d4b57df2b01e8e9933acf25df0e6e742aefab39fb3b0cf66393083f1a05f760142566c58028aa9ee9538fdfdb580f13eafae7f86b57472cf3dadce08fb",
126+
"sha256": "a08a3f300a9d672a47f3d02b034ed6803085991d763dd2a00252e95ce82f1a8a",
127+
"sha1": "5c4823b557468ff24419a346e37d05c68cea1917",
128+
"md5": "609fe68654725f83319ca4ad0f53cd27"
129+
}
130+
]
131+
}
132+
]
133+
}

0 commit comments

Comments
 (0)