diff --git a/buildSrc/src/main/kotlin/BootstrapPlugin.kt b/buildSrc/src/main/kotlin/BootstrapPlugin.kt index 27cd666f45..445959fe45 100644 --- a/buildSrc/src/main/kotlin/BootstrapPlugin.kt +++ b/buildSrc/src/main/kotlin/BootstrapPlugin.kt @@ -14,7 +14,6 @@ class BootstrapPlugin : Plugin { bootstrapDependencies(project(":runelite-api")) bootstrapDependencies(project(":runescape-api")) bootstrapDependencies(project(":http-api")) - bootstrapDependencies(project(":injector")) bootstrapDependencies(project(":runelite-client")) } @@ -31,7 +30,6 @@ class BootstrapPlugin : Plugin { dependsOn(project(":runelite-api").tasks["publish"]) dependsOn(project(":runescape-api").tasks["publish"]) dependsOn(project(":http-api").tasks["publish"]) - dependsOn(project(":injector").tasks["publish"]) doLast { copy { @@ -41,7 +39,6 @@ class BootstrapPlugin : Plugin { copy { from( "${buildDir}/repo/.", - "${parent?.projectDir}/injector/build/repo/.", "${parent?.projectDir}/runelite-api/build/repo/.", "${parent?.projectDir}/http-api/build/repo/.", "${parent?.projectDir}/runescape-api/build/repo/." diff --git a/buildSrc/src/main/kotlin/BootstrapTask.kt b/buildSrc/src/main/kotlin/BootstrapTask.kt index b4769207c8..3eaf7dcebb 100644 --- a/buildSrc/src/main/kotlin/BootstrapTask.kt +++ b/buildSrc/src/main/kotlin/BootstrapTask.kt @@ -6,6 +6,7 @@ import org.gradle.kotlin.dsl.get import java.io.File import java.security.MessageDigest import javax.inject.Inject +import kotlin.system.exitProcess open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultTask() { @@ -42,8 +43,7 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT val version = splat[2] lateinit var path: String - if (it.file.name.contains("injected-client") || - it.file.name.contains("runelite-client") || + 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")) { @@ -63,6 +63,21 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT } path += "${name}/$version/${name}-$version.jar" } + else if (it.file.name.contains("gluegen")) + { + path = "http://repo.runelite.net/net/runelite/gluegen/gluegen-rt/" + version + "/" + it.file.name + } + else if (it.file.name.contains("jogl")) + { + path = "http://repo.runelite.net/net/runelite/jogl/jogl-all/" + version + "/" + it.file.name + } + else + { + println("ERROR: " + it.file.name + " has no download path!") + exitProcess(-1) + } + + val filePath = it.file.absolutePath val artifactFile = File(filePath)