From 88f7b9a9edc1c63ef293308f5f9dfbe39159e0da Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 25 May 2020 04:56:45 +0200 Subject: [PATCH 1/3] Revert "bootstrap: Download rxrelay from the OpenOSRS hosting repo" This reverts commit 6fa6ab4c8efa153dfebb99f7f5396bdcc6142d7d. --- buildSrc/src/main/kotlin/BootstrapTask.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/BootstrapTask.kt b/buildSrc/src/main/kotlin/BootstrapTask.kt index 0bbf2110f8..1c44511dea 100644 --- a/buildSrc/src/main/kotlin/BootstrapTask.kt +++ b/buildSrc/src/main/kotlin/BootstrapTask.kt @@ -51,8 +51,8 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT it.file.name.contains("runescape-api") || it.file.name.contains("runelite-api")) { path = "https://github.com/open-osrs/hosting/raw/master/${type}/${it.file.name}" - } else if (it.file.name.contains("injection-annotations") || it.file.name.contains("rxrelay")) { - path = "https://github.com/open-osrs/hosting/raw/master/" + group.replace(".", "/") + "/${name}/$version/${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}" } else if (!group.contains("runelite")) { path = "https://repo.maven.apache.org/maven2/" + group.replace(".", "/") + "/${name}/$version/${name}-$version" if (it.classifier != null && it.classifier != "no_aop") { From 1a023f52f42a24539363d655ace8f869422794b6 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 25 May 2020 04:57:09 +0200 Subject: [PATCH 2/3] Revert "Revert "rxrelay: Pull artifact from mvn"" This reverts commit 0760673aca1fb324db0f6ad833c1a280c591e37a. --- runelite-client/runelite-client.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index c52e8df31e..dbba829690 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -52,7 +52,7 @@ dependencies { implementation(group = "com.google.guava", name = "guava", version = "29.0-jre") implementation(group = "com.google.inject", name = "guice", version = "4.2.3", classifier = "no_aop") implementation(group = "com.h2database", name = "h2", version = "1.4.200") - implementation(group = "com.openosrs.rxrelay3", name = "rxrelay", version = "3.0.1-SNAPSHOT") + implementation(group = "com.jakewharton.rxrelay3", name = "rxrelay", version = "3.0.0") implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.7.2") implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.4") implementation(group = "net.java.dev.jna", name = "jna", version = "5.5.0") From 61cb0ced3af81d67b57343d41497b77c4712e2e1 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 25 May 2020 05:02:36 +0200 Subject: [PATCH 3/3] bootstrap: Checkstyle --- buildSrc/src/main/kotlin/BootstrapTask.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/BootstrapTask.kt b/buildSrc/src/main/kotlin/BootstrapTask.kt index 1c44511dea..ce9576ed1a 100644 --- a/buildSrc/src/main/kotlin/BootstrapTask.kt +++ b/buildSrc/src/main/kotlin/BootstrapTask.kt @@ -52,7 +52,7 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT it.file.name.contains("runelite-api")) { 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}" + path = "https://github.com/open-osrs/hosting/raw/master/" + group.replace(".", "/") + "/${name}/$version/${it.file.name}" } else if (!group.contains("runelite")) { path = "https://repo.maven.apache.org/maven2/" + group.replace(".", "/") + "/${name}/$version/${name}-$version" if (it.classifier != null && it.classifier != "no_aop") {