Skip to content

Commit c13df6b

Browse files
committed
Update to Gradle 8.14.3
1 parent e923152 commit c13df6b

File tree

8 files changed

+115
-100
lines changed

8 files changed

+115
-100
lines changed

build.gradle

Lines changed: 47 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ group = 'com.hierynomus.gradle.plugins'
3131

3232
java {
3333
toolchain {
34-
languageVersion = JavaLanguageVersion.of(11)
34+
languageVersion = JavaLanguageVersion.of(17)
3535
}
3636
}
3737

@@ -121,11 +121,11 @@ if (JavaVersion.current().isJava8Compatible()) {
121121

122122
task sourcesJar(type: Jar) {
123123
from sourceSets.main.allSource
124-
classifier = 'sources'
124+
archiveClassifier = 'sources'
125125
}
126126

127127
task javadocJar(type: Jar, dependsOn: javadoc) {
128-
classifier = 'javadoc'
128+
archiveClassifier = 'javadoc'
129129
from javadoc.destinationDir
130130
}
131131

@@ -143,81 +143,67 @@ tasks.withType(Test).all { t ->
143143
}
144144
}
145145

146-
def pomConfig = {
147-
name project.name
148-
description project.project_description
149-
url project.project_url
150-
inceptionYear '2011'
151-
152-
scm { url project.project_scm }
153-
154-
licenses {
155-
license([:]) {
156-
name 'The Apache Software License, Version 2.0'
157-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
158-
distribution 'repo'
159-
}
160-
}
161-
162-
developers {
163-
developer {
164-
id 'hierynomus'
165-
name 'Jeroen van Erp'
166-
url 'http://www.javadude.nl/'
167-
email 'jeroen@javadude.nl'
168-
roles { role 'Developer' }
169-
}
170-
}
171-
172-
contributors {
173-
contributor {
174-
name 'Tim Harsch'
175-
email 'harschware@yahoo.com'
176-
}
177-
contributor {
178-
name 'Justin Ryan'
179-
email 'jryan@netflix.com'
180-
}
181-
}
182-
}
183-
184146
gradlePlugin {
185147
plugins {
186148
licensePlugin {
187149
id = "com.github.hierynomus.license"
188150
implementationClass = "nl.javadude.gradle.plugins.license.LicensePlugin"
151+
displayName = "License plugin for Gradle"
152+
description = "Applies a header to files, typically a license"
189153
}
190-
191154
licenseBasePlugin {
192155
id = "com.github.hierynomus.license-base"
193156
implementationClass = "com.hierynomus.gradle.license.LicenseBasePlugin"
157+
displayName = "Base License plugin for Gradle"
158+
description = "Base plugin to apply a header to files, typically a license"
194159
}
195-
196160
licenseReportPlugin {
197161
id = "com.github.hierynomus.license-report"
198162
implementationClass = "com.hierynomus.gradle.license.LicenseReportingPlugin"
163+
displayName = "License Report plugin for Gradle"
164+
description = "Reports over licenses"
199165
}
200166
}
201167
}
202168

203-
pluginBundle {
204-
website = "https://github.com/hierynomus/license-gradle-plugin"
205-
vcsUrl = "https://github.com/hierynomus/license-gradle-plugin.git"
206-
tags = ["gradle", "plugin", "license"]
207-
plugins {
208-
licensePlugin {
209-
displayName = "License plugin for Gradle"
210-
description = "Applies a header to files, typically a license"
211-
}
212-
licenseBasePlugin {
213-
displayName = "Base License plugin for Gradle"
214-
description = "Base plugin to apply a header to files, typically a license"
215-
}
216-
217-
licenseReportPlugin {
218-
displayName = "License Report plugin for Gradle"
219-
description = "Reports over licenses"
220-
tags = [ "gradle", "plugin", "license", "report" ]
169+
publishing {
170+
publications {
171+
pluginMaven(MavenPublication) {
172+
pom {
173+
name = project.name
174+
description = project.description
175+
url = "https://github.com/hierynomus/license-gradle-plugin"
176+
inceptionYear = '2011'
177+
scm {
178+
url = "https://github.com/hierynomus/license-gradle-plugin.git"
179+
}
180+
licenses {
181+
license {
182+
name = 'The Apache Software License, Version 2.0'
183+
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
184+
distribution = 'repo'
185+
}
186+
}
187+
developers {
188+
developer {
189+
id = 'hierynomus'
190+
name = 'Jeroen van Erp'
191+
url = 'http://www.javadude.nl/'
192+
email = 'jeroen@javadude.nl'
193+
roles = ['Developer']
194+
}
195+
}
196+
contributors {
197+
contributor {
198+
name = 'Tim Harsch'
199+
email = 'harschware@yahoo.com'
200+
}
201+
contributor {
202+
name = 'Justin Ryan'
203+
email = 'jryan@netflix.com'
204+
}
205+
}
206+
}
221207
}
222208
}
223209
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
22
androidGradlePlugin = "4.1.0"
3-
animalsniffer = "1.5.3"
3+
animalsniffer = "2.0.1"
44
axionRelease = "1.11.0"
55
guava = "17.0"
66
junit = "4.13.1"
77
licenseMavenPlugin = "3.0"
88
nebulaTest = "8.1.0"
99
plexusUtils = "2.0.5"
10-
pluginPublish = "0.14.0"
10+
pluginPublish = "2.0.0"
1111
spock = "2.0-M5-groovy-3.0"
1212
versionCatalogUpdate = "0.8.4"
1313
versions = "0.51.0"

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

settings.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ gradleEnterprise {
1010
}
1111

1212
rootProject.name='license-gradle-plugin'
13-
14-
enableFeaturePreview('VERSION_CATALOGS')

0 commit comments

Comments
 (0)