From dc6b1cba08892fa213671b70d5e2d510a27d5fac Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Thu, 4 Mar 2021 18:08:23 +0000 Subject: [PATCH] bootstrap: use jshell --- buildSrc/src/main/kotlin/BootstrapPlugin.kt | 5 ++++- buildSrc/src/main/kotlin/BootstrapTask.kt | 3 ++- runelite-jshell/runelite-jshell.gradle.kts | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/BootstrapPlugin.kt b/buildSrc/src/main/kotlin/BootstrapPlugin.kt index 445959fe45..eaeb9cc15e 100644 --- a/buildSrc/src/main/kotlin/BootstrapPlugin.kt +++ b/buildSrc/src/main/kotlin/BootstrapPlugin.kt @@ -15,6 +15,7 @@ class BootstrapPlugin : Plugin { bootstrapDependencies(project(":runescape-api")) bootstrapDependencies(project(":http-api")) bootstrapDependencies(project(":runelite-client")) + bootstrapDependencies(project(":runelite-jshell")) } tasks.register("bootstrapStaging", "staging") @@ -30,6 +31,7 @@ class BootstrapPlugin : Plugin { dependsOn(project(":runelite-api").tasks["publish"]) dependsOn(project(":runescape-api").tasks["publish"]) dependsOn(project(":http-api").tasks["publish"]) + dependsOn(project(":runelite-jshell").tasks["publish"]) doLast { copy { @@ -41,7 +43,8 @@ class BootstrapPlugin : Plugin { "${buildDir}/repo/.", "${parent?.projectDir}/runelite-api/build/repo/.", "${parent?.projectDir}/http-api/build/repo/.", - "${parent?.projectDir}/runescape-api/build/repo/." + "${parent?.projectDir}/runescape-api/build/repo/.", + "${parent?.projectDir}/runelite-jshell/build/repo/." ) into("${buildDir}/bootstrap/repo/${type}") } diff --git a/buildSrc/src/main/kotlin/BootstrapTask.kt b/buildSrc/src/main/kotlin/BootstrapTask.kt index 2a022557cc..8c766ff1b7 100644 --- a/buildSrc/src/main/kotlin/BootstrapTask.kt +++ b/buildSrc/src/main/kotlin/BootstrapTask.kt @@ -47,7 +47,8 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT if (it.file.name.contains("runelite-client") || it.file.name.contains("http-api") || it.file.name.contains("runescape-api") || - it.file.name.contains("runelite-api")) { + it.file.name.contains("runelite-api") || + it.file.name.contains("runelite-jshell")) { path = "https://github.com/open-osrs/hosting/raw/master/${type}/${it.file.name}" } else if (it.file.name.contains("injection-annotations")) { path = "https://github.com/open-osrs/hosting/raw/master/" + group.replace(".", "/") + "/${name}/$version/${it.file.name}" diff --git a/runelite-jshell/runelite-jshell.gradle.kts b/runelite-jshell/runelite-jshell.gradle.kts index cf3a3e54f9..961cfa1ecf 100644 --- a/runelite-jshell/runelite-jshell.gradle.kts +++ b/runelite-jshell/runelite-jshell.gradle.kts @@ -23,6 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +group = "com.openosrs" description = "RuneLite JShell" dependencies {