Skip to content

Commit 0942d24

Browse files
authored
Clean up artifact dependencies, jx browser dependency (#8326)
The change to remove dependencies on files in the `artifacts` directory could break something I'm not aware of, but the plugin seems to build successfully (both from `bin/plugin make` and on sandbox) and `bin/plugin test` also runs successfully. My suspicion is that the artifacts directory used to exist but no longer exists. The 3 previous JX Browser dependencies seem to be equivalent to `implementation` so I changed to that. ([doc](https://docs.gradle.org/current/userguide/dependency_configurations.html#sub:what-are-dependency-configurations))
1 parent 80a555a commit 0942d24

File tree

1 file changed

+1
-95
lines changed

1 file changed

+1
-95
lines changed

build.gradle.kts

Lines changed: 1 addition & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -131,113 +131,19 @@ dependencies {
131131
// TODO(helin24): The rest in this block was pulled over from flutter-idea; potentially parts could be deleted.
132132
compileOnly("org.jetbrains:annotations:24.0.0")
133133
testImplementation("org.jetbrains:annotations:24.0.0")
134-
135-
testRuntimeOnly(
136-
fileTree(
137-
mapOf(
138-
"dir" to "${project.rootDir}/artifacts/android-studio/plugins",
139-
"include" to listOf("**/*.jar"),
140-
"exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar", "**/kotlin-stdlib-jdk8.jar")
141-
)
142-
)
143-
)
144-
compileOnly(
145-
fileTree(
146-
mapOf(
147-
"dir" to "${project.rootDir}/artifacts/android-studio/lib",
148-
"include" to listOf("*.jar"),
149-
"exclude" to listOf("**/annotations.jar")
150-
)
151-
)
152-
)
153-
testRuntimeOnly(
154-
fileTree(
155-
mapOf(
156-
"dir" to "${project.rootDir}/artifacts/android-studio/lib",
157-
"include" to listOf("*.jar")
158-
)
159-
)
160-
)
161-
compileOnly(
162-
fileTree(
163-
mapOf(
164-
"dir" to "${project.rootDir}/artifacts/android-studio/plugins/git4idea/lib",
165-
"include" to listOf("*.jar")
166-
)
167-
)
168-
)
169-
testImplementation(
170-
fileTree(
171-
mapOf(
172-
"dir" to "${project.rootDir}/artifacts/android-studio/plugins/git4idea/lib",
173-
"include" to listOf("*.jar")
174-
)
175-
)
176-
)
177134
compileOnly("com.google.guava:guava:32.0.1-android")
178135
compileOnly("com.google.code.gson:gson:2.10.1")
179136
testImplementation("com.google.guava:guava:32.0.1-jre")
180137
testImplementation("com.google.code.gson:gson:2.10.1")
181138
testImplementation("junit:junit:4.13.2")
182-
runtimeOnly(
183-
fileTree(
184-
mapOf(
185-
"dir" to "${project.rootDir}/third_party/lib/jxbrowser",
186-
"include" to listOf("*.jar")
187-
)
188-
)
189-
)
190-
compileOnly(
139+
implementation(
191140
fileTree(
192141
mapOf(
193142
"dir" to "${project.rootDir}/third_party/lib/jxbrowser",
194143
"include" to listOf("*.jar")
195144
)
196145
)
197146
)
198-
testImplementation(
199-
fileTree(
200-
mapOf(
201-
"dir" to "${project.rootDir}/third_party/lib/jxbrowser",
202-
"include" to listOf("*.jar")
203-
)
204-
)
205-
)
206-
207-
compileOnly(
208-
fileTree(
209-
mapOf(
210-
"dir" to "${project.rootDir}/artifacts/android-studio/lib",
211-
"include" to listOf("*.jar")
212-
)
213-
)
214-
)
215-
testImplementation(
216-
fileTree(
217-
mapOf(
218-
"dir" to "${project.rootDir}/artifacts/android-studio/lib",
219-
"include" to listOf("*.jar")
220-
)
221-
)
222-
)
223-
compileOnly(
224-
fileTree(
225-
mapOf(
226-
"dir" to "${project.rootDir}/artifacts/android-studio/plugins",
227-
"include" to listOf("**/*.jar"),
228-
"exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar")
229-
)
230-
)
231-
)
232-
testImplementation(
233-
fileTree(
234-
mapOf(
235-
"dir" to "${project.rootDir}/artifacts/android-studio/plugins",
236-
"include" to listOf("**/*.jar"),
237-
"exclude" to listOf("**/kotlin-compiler.jar", "**/kotlin-plugin.jar")
238-
)
239-
)
240-
)
241147
}
242148

243149

0 commit comments

Comments
 (0)