Skip to content

Commit fe80723

Browse files
GooolerGoooler
authored
Minor stuffs (#1267)
1 parent cd0013b commit fe80723

File tree

7 files changed

+281
-298
lines changed

7 files changed

+281
-298
lines changed

‎lint-baseline.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,66 +37,66 @@
3737
<issue
3838
id="InternalGradleApiUsage"
3939
message="Avoid using internal Gradle APIs"
40-
errorLine1="import org.gradle.api.internal.file.CopyActionProcessingStreamAction"
41-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
40+
errorLine1="import org.gradle.api.internal.DocumentationRegistry"
41+
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
4242
<location
43-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RealStreamAction.kt"
44-
line="19"
43+
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
44+
line="26"
4545
column="1"/>
4646
</issue>
4747

4848
<issue
4949
id="InternalGradleApiUsage"
5050
message="Avoid using internal Gradle APIs"
51-
errorLine1="import org.gradle.api.internal.file.copy.FileCopyDetailsInternal"
52-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
51+
errorLine1="import org.gradle.api.internal.file.CopyActionProcessingStreamAction"
52+
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
5353
<location
54-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RealStreamAction.kt"
55-
line="20"
54+
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
55+
line="27"
5656
column="1"/>
5757
</issue>
5858

5959
<issue
6060
id="InternalGradleApiUsage"
6161
message="Avoid using internal Gradle APIs"
62-
errorLine1="import org.gradle.api.internal.DocumentationRegistry"
63-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
62+
errorLine1="import org.gradle.api.internal.file.DefaultFilePermissions"
63+
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
6464
<location
6565
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
66-
line="22"
66+
line="28"
6767
column="1"/>
6868
</issue>
6969

7070
<issue
7171
id="InternalGradleApiUsage"
7272
message="Avoid using internal Gradle APIs"
73-
errorLine1="import org.gradle.api.internal.file.DefaultFilePermissions"
74-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
73+
errorLine1="import org.gradle.api.internal.file.copy.CopyAction"
74+
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
7575
<location
7676
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
77-
line="23"
77+
line="29"
7878
column="1"/>
7979
</issue>
8080

8181
<issue
8282
id="InternalGradleApiUsage"
8383
message="Avoid using internal Gradle APIs"
84-
errorLine1="import org.gradle.api.internal.file.copy.CopyAction"
85-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
84+
errorLine1="import org.gradle.api.internal.file.copy.CopyActionProcessingStream"
85+
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
8686
<location
8787
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
88-
line="24"
88+
line="30"
8989
column="1"/>
9090
</issue>
9191

9292
<issue
9393
id="InternalGradleApiUsage"
9494
message="Avoid using internal Gradle APIs"
95-
errorLine1="import org.gradle.api.internal.file.copy.CopyActionProcessingStream"
96-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
95+
errorLine1="import org.gradle.api.internal.file.copy.FileCopyDetailsInternal"
96+
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
9797
<location
9898
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
99-
line="25"
99+
line="31"
100100
column="1"/>
101101
</issue>
102102

@@ -107,7 +107,7 @@
107107
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
108108
<location
109109
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
110-
line="35"
110+
line="34"
111111
column="1"/>
112112
</issue>
113113

@@ -118,7 +118,7 @@
118118
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
119119
<location
120120
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
121-
line="36"
121+
line="35"
122122
column="1"/>
123123
</issue>
124124

@@ -129,7 +129,7 @@
129129
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
130130
<location
131131
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
132-
line="37"
132+
line="36"
133133
column="1"/>
134134
</issue>
135135

@@ -140,7 +140,7 @@
140140
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
141141
<location
142142
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
143-
line="38"
143+
line="37"
144144
column="1"/>
145145
</issue>
146146

‎src/docs/application-plugin/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ application {
7979
// `shadow` is the name of the distribution created by Shadow plugin
8080
distributions.named('shadow') {
8181
// Optionally, you can add more files into extra directory in the distribution like this:
82-
contents.into('extra') {
83-
from project.file('extra/echo.sh')
82+
contents.from('extra/echo.sh') {
83+
into 'extra'
8484
}
8585
}
8686
```

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ class ApplicationPluginTest : BasePluginTest() {
156156
prepare(
157157
projectBlock = """
158158
distributions.named('$DISTRIBUTION_NAME') {
159-
contents.into('extra') {
160-
from project.file('extra/echo.sh')
159+
contents.from('extra/echo.sh') {
160+
into 'extra'
161161
}
162162
}
163163
""".trimIndent(),

‎src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowBasePlugin.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public abstract class ShadowBasePlugin : Plugin<Project> {
1414
if (GradleVersion.current() < GradleVersion.version("8.3")) {
1515
throw GradleException("This version of Shadow supports Gradle 8.3+ only. Please upgrade.")
1616
}
17+
@Suppress("DEPRECATION")
1718
project.extensions.create(EXTENSION_NAME, ShadowExtension::class.java, project)
1819
project.configurations.create(CONFIGURATION_NAME)
1920
}

0 commit comments

Comments
 (0)