File tree 9 files changed +38
-8
lines changed
9 files changed +38
-8
lines changed Original file line number Diff line number Diff line change 6
6
pull_request :
7
7
push :
8
8
branches : [main]
9
+ workflow_dispatch :
10
+
9
11
concurrency :
10
12
group : ${{ github.workflow }}-${{ github.ref }}
11
13
cancel-in-progress : true
Original file line number Diff line number Diff line change @@ -10,6 +10,8 @@ This document is intended for Spotless developers.
10
10
We adhere to the [ keepachangelog] ( https://keepachangelog.com/en/1.0.0/ ) format (starting after version ` 1.27.0 ` ).
11
11
12
12
## [ Unreleased]
13
+ ### Changes
14
+ * We are now opting in to Gradle's new stable configuration cache. ([ #1591 ] ( https://github.com/diffplug/spotless/pull/1591 ) )
13
15
14
16
## [ 2.36.0] - 2023-02-27
15
17
### Added
Original file line number Diff line number Diff line change 12
12
p2Dependencies = " p2Dependencies not defined in project"
13
13
}
14
14
15
- // Some JARs may include JARs themselfs, which shall be unpacked and added to the embedded class folder.
15
+ // Some JARs may include JARs themselfs, which shall be unpacked and added to the embedded class folder.
16
16
if (! project. hasProperty(' internalJars' )) {
17
17
internalJars = []
18
18
}
@@ -35,13 +35,13 @@ ext {
35
35
' META-INF/*.SF' , // ... so all signatures are filtered
36
36
]
37
37
}
38
-
38
+
39
39
// Map fat-JAR resources path if JAR file name does not correspond to plugin package name (e.g. required for internal plugins)
40
40
if (! project. hasProperty(' fatJarResourcesMap' )) {
41
41
fatJarResourcesMap = [:]
42
42
}
43
-
44
-
43
+
44
+
45
45
// The directory contains all external classes for the fat-jar
46
46
embeddedClassesDirName = ' build/embeddedClasses'
47
47
embeddedClassesDir = project. file(embeddedClassesDirName)
@@ -163,3 +163,7 @@ apply plugin: 'idea'
163
163
// Encure that the dependent classes are preovided for compilation if project is build via Eclipse instead of command line
164
164
tasks. idea. dependsOn(unjarEmbeddedClasses)
165
165
166
+ tasks. named(' ideaModule' ) {
167
+ notCompatibleWithConfigurationCache(" https://github.com/gradle/gradle/issues/13480" )
168
+ }
169
+
Original file line number Diff line number Diff line change 1
1
# To fix metaspace errors
2
- org.gradle.jvmargs =-Xmx2g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
2
+ org.gradle.jvmargs =-Xmx4g -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
3
+ org.gradle.parallel =true
4
+ org.gradle.caching =true
5
+ org.gradle.unsafe.configuration-cache =true
6
+
3
7
name =spotless
4
8
description =Spotless - keep your code spotless with Gradle
5
9
org =diffplug
Original file line number Diff line number Diff line change @@ -200,6 +200,10 @@ if (System.env['JITPACK'] == 'true' || version.endsWith('-SNAPSHOT')) {
200
200
}
201
201
}
202
202
203
+ tasks. withType(Sign ). configureEach {
204
+ notCompatibleWithConfigurationCache(" https://github.com/gradle/gradle/issues/13470" )
205
+ }
206
+
203
207
tasks. withType(AbstractArchiveTask ). configureEach {
204
208
preserveFileTimestamps = false
205
209
reproducibleFileOrder = true
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask).configureEach {
30
30
reports {
31
31
html. enabled = true
32
32
}
33
+ notCompatibleWithConfigurationCache(" https://github.com/spotbugs/spotbugs-gradle-plugin/issues/670" )
33
34
}
34
35
35
36
tasks. named(' spotbugsMain' ) {
Original file line number Diff line number Diff line change @@ -73,8 +73,10 @@ gradlePlugin {
73
73
}
74
74
}
75
75
}
76
- if (version. endsWith(' -SNAPSHOT' )) {
77
- publishPlugins. enabled = false
76
+
77
+ tasks. named(" publishPlugins" ) {
78
+ enabled = ! version. endsWith(' -SNAPSHOT' )
79
+ notCompatibleWithConfigurationCache(" https://github.com/gradle/gradle/issues/21283" )
78
80
}
79
81
80
82
// have to apply java-publish after setting up the pluginBundle
Original file line number Diff line number Diff line change
1
+ import de.benediktritter.maven.plugin.development.task.GenerateHelpMojoSourcesTask
2
+ import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
3
+
1
4
plugins {
2
5
// https://www.benediktritter.de/maven-plugin-development/#release-history
3
6
id ' de.benediktritter.maven-plugin-development' version ' 0.4.1'
@@ -10,13 +13,19 @@ version = spotlessChangelog.versionNext
10
13
apply from : rootProject. file(" gradle/java-setup.gradle" )
11
14
apply from : rootProject. file(' gradle/spotless-freshmark.gradle' )
12
15
13
- apply plugin : ' de.benediktritter.maven-plugin-development'
14
16
mavenPlugin {
15
17
name = ' Spotless Maven Plugin'
16
18
artifactId = project. artifactIdMaven
17
19
description = project. description
18
20
}
19
21
22
+ tasks. withType(GenerateMavenPluginDescriptorTask ). configureEach {
23
+ notCompatibleWithConfigurationCache(' https://github.com/britter/maven-plugin-development/issues/8' )
24
+ }
25
+ tasks. withType(GenerateHelpMojoSourcesTask ). configureEach {
26
+ notCompatibleWithConfigurationCache(' https://github.com/britter/maven-plugin-development/issues/8' )
27
+ }
28
+
20
29
String VER_MAVEN_API = ' 3.0'
21
30
String VER_ECLIPSE_AETHER = ' 1.1.0'
22
31
String VER_PLEXUS_RESOURCES = ' 1.2.0'
Original file line number Diff line number Diff line change @@ -68,6 +68,8 @@ gradleEnterprise {
68
68
}
69
69
}
70
70
71
+ enableFeaturePreview(" STABLE_CONFIGURATION_CACHE" )
72
+
71
73
rootProject. name = ' spotless'
72
74
73
75
include ' lib' // reusable library with no dependencies
You can’t perform that action at this time.
0 commit comments