Skip to content

Commit ceabb88

Browse files
committed
Polish stuff
1 parent 13c7f52 commit ceabb88

File tree

4 files changed

+8
-34
lines changed

4 files changed

+8
-34
lines changed

build.gradle.kts

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ plugins {
77
groovy
88
`java-gradle-plugin`
99
id("com.gradle.plugin-publish") version "1.3.1"
10-
id("com.vanniktech.maven.publish") version "0.32.0"
11-
id("com.diffplug.spotless") version "7.0.4"
10+
id("com.vanniktech.maven.publish") version "0.34.0"
11+
id("com.diffplug.spotless") version "7.2.1"
1212
}
1313

1414
version = providers.gradleProperty("VERSION_NAME").get()
@@ -18,8 +18,6 @@ description = providers.gradleProperty("POM_DESCRIPTION").get()
1818
java {
1919
sourceCompatibility = JavaVersion.VERSION_1_8
2020
targetCompatibility = JavaVersion.VERSION_1_8
21-
withSourcesJar()
22-
withJavadocJar()
2321
}
2422

2523
gradlePlugin {
@@ -40,8 +38,6 @@ gradlePlugin {
4038
spotless {
4139
kotlinGradle {
4240
ktlint()
43-
target("**/*.kts")
44-
targetExclude("build-logic/build/**")
4541
}
4642
}
4743

@@ -97,35 +93,15 @@ dependencies {
9793
testImplementation("org.junit.platform:junit-platform-suite-engine")
9894
}
9995

100-
tasks.withType<Javadoc>().configureEach {
101-
(options as? StandardJavadocDocletOptions)?.let {
102-
it.links(
103-
"https://docs.oracle.com/en/java/javase/17/docs/api/",
104-
"https://docs.groovy-lang.org/2.4.7/html/gapi/",
105-
)
106-
it.addStringOption("Xdoclint:none", "-quiet")
107-
}
108-
}
109-
110-
val isCI = providers.environmentVariable("CI").isPresent
111-
11296
tasks.withType<Test>().configureEach {
11397
useJUnitPlatform()
11498

11599
val testGradleVersion = providers.gradleProperty("testGradleVersion").orNull.let {
116100
if (it == null || it == "current") GradleVersion.current().version else it
117101
}
118-
logger.info("Using test Gradle version: $testGradleVersion")
102+
logger.lifecycle("Using test Gradle version: $testGradleVersion")
119103
systemProperty("TEST_GRADLE_VERSION", testGradleVersion)
120104

121-
if (isCI) {
122-
testLogging.showStandardStreams = true
123-
minHeapSize = "1g"
124-
maxHeapSize = "1g"
125-
}
126-
127-
systemProperty("shadowVersion", version)
128-
129105
// Required to test configuration cache in tests when using withDebug()
130106
// https://github.com/gradle/gradle/issues/22765#issuecomment-1339427241
131107
jvmArgs(

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ GROUP=com.gradleup.shadow
1313
POM_ARTIFACT_ID=shadow-gradle-plugin
1414
VERSION_NAME=8.3.10-SNAPSHOT
1515

16-
SONATYPE_AUTOMATIC_RELEASE=true
17-
SONATYPE_HOST=CENTRAL_PORTAL
18-
RELEASE_SIGNING_ENABLED=true
16+
mavenCentralAutomaticPublishing=true
17+
mavenCentralPublishing=true
18+
signAllPublications=true
1919

2020
POM_NAME=Shadow Gradle Plugin
2121
POM_DESCRIPTION=Gradle plugin to create fat/uber JARs, apply file transforms, and relocate packages for applications and libraries. Gradle version of Maven's Shade plugin.

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/docs/executer/GradleBuildExecuter.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ repositories {
8282
}
8383

8484
private static String replaceTokens(String snippet) {
85-
return snippet.replaceAll("@version@", PluginSpecification.SHADOW_VERSION + '-SNAPSHOT')
85+
return snippet.replaceAll("@version@", 'latest')
8686
}
8787
}

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ abstract class PluginSpecification extends Specification {
1616

1717
@TempDir Path dir
1818

19-
public static final String SHADOW_VERSION = System.getProperty("shadowVersion")
20-
2119
public static final String TEST_GRADLE_VERSION = System.getProperty("TEST_GRADLE_VERSION")
2220

2321
AppendableMavenFileRepository repo
@@ -41,7 +39,7 @@ abstract class PluginSpecification extends Specification {
4139
return """
4240
plugins {
4341
id '${javaPlugin}'
44-
id 'com.gradleup.shadow' version '${SHADOW_VERSION}'
42+
id 'com.gradleup.shadow'
4543
}
4644
4745
version = "1.0"

0 commit comments

Comments
 (0)