Skip to content

Commit 8f4d4b4

Browse files
committed
Tweak Gradle flags (#1093)
(cherry picked from commit ccc04a6)
1 parent b6b90f9 commit 8f4d4b4

File tree

3 files changed

+43
-23
lines changed

3 files changed

+43
-23
lines changed

build-logic/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.kotlin.dsl.allWarningsAsErrors=true

gradle.properties

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4g -XX:MaxMetaspaceSize=2g
2-
org.gradle.parallel=true
1+
# Omit automatic compile dependency on kotlin-stdlib
2+
# https://kotlinlang.org/docs/gradle.html#dependency-on-the-standard-library
3+
kotlin.stdlib.default.dependency=false
4+
35
org.gradle.caching=true
46
org.gradle.configuration-cache=true
57
org.gradle.configuration-cache.parallel=true
6-
8+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx4g -XX:MaxMetaspaceSize=2g
9+
org.gradle.kotlin.dsl.allWarningsAsErrors=true
10+
org.gradle.parallel=true
711

812
GROUP=com.gradleup.shadow
913
POM_ARTIFACT_ID=shadow-gradle-plugin

src/docs/configuration/merging/README.md

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,22 @@ determine if it should process a particular entry and apply any modifications be
1212
// Adding a Transformer
1313
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
1414
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
15+
import javax.annotation.Nonnull
1516
import org.apache.tools.zip.ZipOutputStream
1617
import org.gradle.api.file.FileTreeElement
1718
1819
class MyTransformer implements Transformer {
19-
boolean canTransformResource(FileTreeElement element) { true }
20+
@Override
21+
boolean canTransformResource(@Nonnull FileTreeElement element) { return true }
2022
21-
void transform(TransformerContext context) {}
23+
@Override
24+
void transform(@Nonnull TransformerContext context) {}
2225
23-
boolean hasTransformedResource() { true }
26+
@Override
27+
boolean hasTransformedResource() { return true }
2428
25-
void modifyOutputStream(ZipOutputStream jos, boolean preserveFileTimestamps) {}
29+
@Override
30+
void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {}
2631
}
2732
2833
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
@@ -36,20 +41,24 @@ Additionally, a `Transformer` can accept a `Closure` to configure the provided `
3641
// Configuring a Transformer
3742
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
3843
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
44+
import javax.annotation.Nonnull
3945
import org.apache.tools.zip.ZipOutputStream
4046
import org.gradle.api.file.FileTreeElement
4147
4248
class MyTransformer implements Transformer {
49+
boolean enabled
4350
44-
boolean enabled
51+
@Override
52+
boolean canTransformResource(@Nonnull FileTreeElement element) { return true }
4553
46-
boolean canTransformResource(FileTreeElement element) { true }
54+
@Override
55+
void transform(@Nonnull TransformerContext context) {}
4756
48-
void transform(TransformerContext context) {}
57+
@Override
58+
boolean hasTransformedResource() { return true }
4959
50-
boolean hasTransformedResource() { true }
51-
52-
void modifyOutputStream(ZipOutputStream jos, boolean preserveFileTimestamps) {}
60+
@Override
61+
void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {}
5362
}
5463
5564
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
@@ -65,24 +74,32 @@ An instantiated instance of a `Transformer` can also be provided.
6574
// Adding a Transformer Instance
6675
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
6776
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
77+
import javax.annotation.Nonnull
6878
import org.apache.tools.zip.ZipOutputStream
6979
import org.gradle.api.file.FileTreeElement
7080
7181
class MyTransformer implements Transformer {
82+
final boolean enabled
7283
73-
boolean enabled
84+
MyTransformer(boolean enabled) {
85+
this.enabled = enabled
86+
}
7487
75-
boolean canTransformResource(FileTreeElement element) { true }
88+
@Override
89+
boolean canTransformResource(@Nonnull FileTreeElement element) { return true }
7690
77-
void transform(TransformerContext context) {}
91+
@Override
92+
void transform(@Nonnull TransformerContext context) {}
7893
79-
boolean hasTransformedResource() { true }
94+
@Override
95+
boolean hasTransformedResource() { return true }
8096
81-
void modifyOutputStream(ZipOutputStream jos, boolean preserveFileTimestamps) {}
97+
@Override
98+
void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {}
8299
}
83100
84101
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
85-
transform(new MyTransformer(enabled: true))
102+
transform(new MyTransformer(true))
86103
}
87104
```
88105

@@ -186,11 +203,9 @@ It must be added using the [`transform`](https://gradleup.com/shadow/api/com/git
186203

187204
```groovy
188205
// Appending a XML File
189-
import com.github.jengelman.gradle.plugins.shadow.transformers.XmlAppendingTransformer
190-
191206
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
192-
transform(XmlAppendingTransformer.class) {
207+
transform(com.github.jengelman.gradle.plugins.shadow.transformers.XmlAppendingTransformer.class) {
193208
resource = 'properties.xml'
194209
}
195210
}
196-
```
211+
```

0 commit comments

Comments
 (0)