Skip to content

Commit a981f25

Browse files
authored
Use top-level directory gradle and delete from third_party (#8397)
Gradle files should generally be at the top level and the jar file should be committed: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:adding_wrapper We also want to check that the gradle jar file matches the checksums listed: https://docs.gradle.org/current/userguide/gradle_wrapper.html#wrapper_checksum_verification (Added #8396 to do this automatically in the future) I verified that our dev build works with using the new top-level files instead of calling `./third_party/gradlew`
1 parent 25691ea commit a981f25

File tree

13 files changed

+9
-353
lines changed

13 files changed

+9
-353
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,3 @@ lib/kotlin*
4747
.gradle
4848
/build/
4949
gradle-app.setting
50-
gradle/wrapper/gradle-wrapper.jar

build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ tasks {
282282
}
283283

284284
// A task to print the classpath used for compiling an IntelliJ plugin
285-
// Run with `./third_party/gradlew printCompileClasspath --no-configuration-cache `
285+
// Run with `./gradlew printCompileClasspath --no-configuration-cache `
286286
tasks.register("printCompileClasspath") {
287287
doLast {
288288
println("--- Begin Compile Classpath ---")
@@ -314,8 +314,6 @@ val writeLicenseKey = tasks.register("writeLicenseKey") {
314314
if (readFile.isFile) {
315315
val licenseKey = readFile.readText(Charsets.UTF_8)
316316
licenseFile.writeText("jxbrowser.license.key=$licenseKey")
317-
} else {
318-
println("$readFile is not a file")
319317
}
320318
}
321319
}

gradle/wrapper/gradle-wrapper.jar

42.7 KB
Binary file not shown.

third_party/gradle-LICENSE.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.
-59.3 KB
Binary file not shown.

third_party/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

third_party/gradlew

Lines changed: 0 additions & 240 deletions
This file was deleted.

third_party/gradlew.bat

Lines changed: 0 additions & 91 deletions
This file was deleted.

tool/kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ setup
55

66
echo "kokoro build start"
77

8-
./third_party/gradlew buildPlugin
8+
./gradlew buildPlugin
99

1010
echo "kokoro build finished"

tool/kokoro/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setup
55

66
echo "kokoro build start"
77

8-
./third_party/gradlew buildPlugin -Pdev-version=88.0
8+
./gradlew buildPlugin -Pdev-version=88.0
99

1010
echo "kokoro build finished"
1111

0 commit comments

Comments
 (0)