From ccbbf873af577f2a45c17ecc3f1d54f448261b0e Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 9 Feb 2020 14:58:39 +0000 Subject: [PATCH] Switch from Maven to Gradle --- .editorconfig | 2 +- .gitignore | 6 +- .idea/runConfigurations/AstDeobfuscator.xml | 2 +- .idea/runConfigurations/Bundler.xml | 2 +- .idea/runConfigurations/Decompiler.xml | 2 +- .idea/runConfigurations/Deobfuscator.xml | 2 +- .idea/runConfigurations/GameServer.xml | 2 +- .idea/runConfigurations/client.xml | 2 +- README.md | 11 +- all/build.gradle.kts | 81 +++++++ all/pom.xml | 90 -------- all/src/assembly/bin.xml | 30 --- all/src/bin/openrs2-bundle | 3 - all/src/bin/openrs2-bundle.cmd | 3 - all/src/bin/openrs2-decompiler | 3 - all/src/bin/openrs2-decompiler.cmd | 3 - all/src/bin/openrs2-deob | 3 - all/src/bin/openrs2-deob-ast | 3 - all/src/bin/openrs2-deob-ast.cmd | 3 - all/src/bin/openrs2-deob.cmd | 3 - all/src/bin/openrs2-game | 3 - all/src/bin/openrs2-game.cmd | 3 - all/src/main/java/dev/openrs2/Launcher.kt | 39 ++++ asm/build.gradle.kts | 27 +++ asm/pom.xml | 43 ---- build.gradle.kts | 203 +++++++++++++++++ buildSrc/build.gradle.kts | 7 + buildSrc/settings.gradle.kts | 1 + buildSrc/src/main/java/Versions.kt | 19 ++ bundler/build.gradle.kts | 30 +++ bundler/pom.xml | 35 --- common/build.gradle.kts | 26 +++ common/pom.xml | 59 ----- decompiler/build.gradle.kts | 30 +++ decompiler/pom.xml | 35 --- deob-annotations/build.gradle.kts | 21 ++ deob-annotations/pom.xml | 26 --- deob-ast/build.gradle.kts | 29 +++ deob-ast/pom.xml | 35 --- deob/build.gradle.kts | 32 +++ deob/pom.xml | 42 ---- docs/faq.md | 20 +- game/build.gradle.kts | 27 +++ game/pom.xml | 26 --- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++ gradlew.bat | 100 ++++++++ jsobject/build.gradle.kts | 20 ++ jsobject/pom.xml | 23 -- pom.xml | 241 -------------------- settings.gradle.kts | 29 +++ 53 files changed, 929 insertions(+), 747 deletions(-) create mode 100644 all/build.gradle.kts delete mode 100644 all/pom.xml delete mode 100644 all/src/assembly/bin.xml delete mode 100755 all/src/bin/openrs2-bundle delete mode 100644 all/src/bin/openrs2-bundle.cmd delete mode 100755 all/src/bin/openrs2-decompiler delete mode 100644 all/src/bin/openrs2-decompiler.cmd delete mode 100755 all/src/bin/openrs2-deob delete mode 100755 all/src/bin/openrs2-deob-ast delete mode 100644 all/src/bin/openrs2-deob-ast.cmd delete mode 100644 all/src/bin/openrs2-deob.cmd delete mode 100755 all/src/bin/openrs2-game delete mode 100644 all/src/bin/openrs2-game.cmd create mode 100644 all/src/main/java/dev/openrs2/Launcher.kt create mode 100644 asm/build.gradle.kts delete mode 100644 asm/pom.xml create mode 100644 build.gradle.kts create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/settings.gradle.kts create mode 100644 buildSrc/src/main/java/Versions.kt create mode 100644 bundler/build.gradle.kts delete mode 100644 bundler/pom.xml create mode 100644 common/build.gradle.kts delete mode 100644 common/pom.xml create mode 100644 decompiler/build.gradle.kts delete mode 100644 decompiler/pom.xml create mode 100644 deob-annotations/build.gradle.kts delete mode 100644 deob-annotations/pom.xml create mode 100644 deob-ast/build.gradle.kts delete mode 100644 deob-ast/pom.xml create mode 100644 deob/build.gradle.kts delete mode 100644 deob/pom.xml create mode 100644 game/build.gradle.kts delete mode 100644 game/pom.xml create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 jsobject/build.gradle.kts delete mode 100644 jsobject/pom.xml delete mode 100644 pom.xml create mode 100644 settings.gradle.kts diff --git a/.editorconfig b/.editorconfig index 74a473cd..899d481a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ trim_trailing_whitespace = true max_line_length = 120 indent_style = tab -[*.kt] +[*.{kt,kts}] indent_style = space indent_size = 4 # see https://github.com/pinterest/ktlint/issues/527 diff --git a/.gitignore b/.gitignore index e49a10ea..a56a06e6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,12 @@ !.idea !.mailmap *.iml +*/build +*/out */target *~ /nonfree +/build +/out /target hs_err_pid*.log -pom.xml.releaseBackup -release.properties diff --git a/.idea/runConfigurations/AstDeobfuscator.xml b/.idea/runConfigurations/AstDeobfuscator.xml index 881ecc9d..598fc5fa 100644 --- a/.idea/runConfigurations/AstDeobfuscator.xml +++ b/.idea/runConfigurations/AstDeobfuscator.xml @@ -1,6 +1,6 @@ - +