Skip to content

Commit bd7f137

Browse files
GooolerGoooler
authored
Inline suppressions for InternalGradleApiUsage (#1780)
* Suppress `InternalGradleApiUsage` for `DefaultInheritManifest` * Suppress `InternalGradleApiUsage` for `ShadowCopyAction`
1 parent 3474bea commit bd7f137

File tree

4 files changed

+5
-146
lines changed

4 files changed

+5
-146
lines changed

‎gradle/lint-baseline.xml‎

Lines changed: 0 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<issues format="6" by="lint 8.13.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.13.0)" variant="all" version="8.13.0">
33

4-
<issue
5-
id="InternalGradleApiUsage"
6-
message="Avoid using internal Gradle APIs"
7-
errorLine1="import org.gradle.api.internal.file.FileResolver"
8-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
9-
<location
10-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
11-
line="8"
12-
column="1"/>
13-
</issue>
14-
15-
<issue
16-
id="InternalGradleApiUsage"
17-
message="Avoid using internal Gradle APIs"
18-
errorLine1="import org.gradle.api.internal.project.DefaultProject"
19-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
20-
<location
21-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
22-
line="9"
23-
column="1"/>
24-
</issue>
25-
26-
<issue
27-
id="InternalGradleApiUsage"
28-
message="Avoid using internal Gradle APIs"
29-
errorLine1="import org.gradle.api.java.archives.internal.DefaultManifest"
30-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
31-
<location
32-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
33-
line="12"
34-
column="1"/>
35-
</issue>
36-
37-
<issue
38-
id="InternalGradleApiUsage"
39-
message="Avoid using internal Gradle APIs"
40-
errorLine1="import org.gradle.api.java.archives.internal.DefaultManifestMergeSpec"
41-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
42-
<location
43-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
44-
line="13"
45-
column="1"/>
46-
</issue>
47-
48-
<issue
49-
id="InternalGradleApiUsage"
50-
message="Avoid using internal Gradle APIs (method get from org.gradle.internal.service.ServiceRegistry)"
51-
errorLine1=" private val fileResolver: FileResolver = (project as DefaultProject).services.get(FileResolver::class.java),"
52-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
53-
<location
54-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
55-
line="20"
56-
column="44"/>
57-
</issue>
58-
59-
<issue
60-
id="InternalGradleApiUsage"
61-
message="Avoid using internal Gradle APIs (method get from org.gradle.internal.service.ServiceRegistry)"
62-
errorLine1=" private val fileResolver: FileResolver = (project as DefaultProject).services.get(FileResolver::class.java),"
63-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
64-
<location
65-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
66-
line="20"
67-
column="44"/>
68-
</issue>
69-
70-
<issue
71-
id="InternalGradleApiUsage"
72-
message="Avoid using internal Gradle APIs (method merge from org.gradle.api.java.archives.internal.DefaultManifestMergeSpec)"
73-
errorLine1=" base = it.merge(base, fileResolver)"
74-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
75-
<location
76-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/DefaultInheritManifest.kt"
77-
line="39"
78-
column="14"/>
79-
</issue>
80-
81-
<issue
82-
id="InternalGradleApiUsage"
83-
message="Avoid using internal Gradle APIs"
84-
errorLine1="import org.gradle.api.internal.file.CopyActionProcessingStreamAction"
85-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
86-
<location
87-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
88-
line="19"
89-
column="1"/>
90-
</issue>
91-
92-
<issue
93-
id="InternalGradleApiUsage"
94-
message="Avoid using internal Gradle APIs"
95-
errorLine1="import org.gradle.api.internal.file.copy.CopyAction"
96-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
97-
<location
98-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
99-
line="20"
100-
column="1"/>
101-
</issue>
102-
103-
<issue
104-
id="InternalGradleApiUsage"
105-
message="Avoid using internal Gradle APIs"
106-
errorLine1="import org.gradle.api.internal.file.copy.CopyActionProcessingStream"
107-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
108-
<location
109-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
110-
line="21"
111-
column="1"/>
112-
</issue>
113-
114-
<issue
115-
id="InternalGradleApiUsage"
116-
message="Avoid using internal Gradle APIs"
117-
errorLine1="import org.gradle.api.internal.file.copy.FileCopyDetailsInternal"
118-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
119-
<location
120-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
121-
line="22"
122-
column="1"/>
123-
</issue>
124-
125-
<issue
126-
id="InternalGradleApiUsage"
127-
message="Avoid using internal Gradle APIs (method process from org.gradle.api.internal.file.copy.CopyActionProcessingStream)"
128-
errorLine1=" stream.process(StreamAction(zos))"
129-
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
130-
<location
131-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowCopyAction.kt"
132-
line="54"
133-
column="9"/>
134-
</issue>
135-
136-
<issue
137-
id="InternalGradleApiUsage"
138-
message="Avoid using internal Gradle APIs"
139-
errorLine1="import org.gradle.api.internal.file.copy.CopyAction"
140-
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
141-
<location
142-
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
143-
line="44"
144-
column="1"/>
145-
</issue>
146-
1474
</issues>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@file:Suppress("DEPRECATION")
1+
@file:Suppress("DEPRECATION", "InternalGradleApiUsage") // TODO: remove this in Shadow 10.
22

33
package com.github.jengelman.gradle.plugins.shadow.internal
44

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("InternalGradleApiUsage") // We have to use internal Gradle APIs to implement a CopyAction.
2+
13
package com.github.jengelman.gradle.plugins.shadow.tasks
24

35
import com.github.jengelman.gradle.plugins.shadow.internal.RelocatorRemapper

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import org.gradle.api.file.DuplicatesStrategy.FAIL
4141
import org.gradle.api.file.DuplicatesStrategy.INCLUDE
4242
import org.gradle.api.file.DuplicatesStrategy.INHERIT
4343
import org.gradle.api.file.DuplicatesStrategy.WARN
44-
import org.gradle.api.internal.file.copy.CopyAction
4544
import org.gradle.api.provider.Property
4645
import org.gradle.api.provider.SetProperty
4746
import org.gradle.api.tasks.CacheableTask
@@ -387,7 +386,8 @@ public abstract class ShadowJar : Jar() {
387386
super.copy()
388387
}
389388

390-
override fun createCopyAction(): CopyAction {
389+
@Suppress("InternalGradleApiUsage") // For creating ShadowCopyAction.
390+
override fun createCopyAction(): org.gradle.api.internal.file.copy.CopyAction {
391391
val zosProvider = { destination: File ->
392392
try {
393393
val entryCompressionMethod = when (entryCompression) {

0 commit comments

Comments
 (0)