ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3227 from open-osrs/oopsie-yet-again

Browse Source
This commit is contained in:
Owain van Brakel
2022-06-23 23:26:25 +02:00
committed by GitHub
parent 8af6f77e18 bf1a6c6200
commit b0fa3e3196
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -165,7 +165,7 @@ subprojects {
exclude("**/RoomType.java") exclude("**/RoomType.java")
} }
/*withType<Jar> { withType<Jar> {
doLast { doLast {
// sign jar // sign jar
if (System.getProperty("signKeyStore") != null) { if (System.getProperty("signKeyStore") != null) {
@@ -187,7 +187,7 @@ subprojects {
} }
} }
} }
}*/ }
} }
configurations.compileOnly.get().extendsFrom(configurations["annotationProcessor"]) configurations.compileOnly.get().extendsFrom(configurations["annotationProcessor"])

2
buildSrc/src/main/kotlin/BootstrapTask.kt
View File

@@ -155,8 +155,6 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT
it.file.name.contains("runelite-api") || it.file.name.contains("runelite-api") ||
it.file.name.contains("runelite-jshell")) { it.file.name.contains("runelite-jshell")) {
path = "https://github.com/open-osrs/hosting/raw/master/${type}/${it.file.name}" 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}"
} else if (!group.contains("runelite")) { } else if (!group.contains("runelite")) {
path = "https://repo.maven.apache.org/maven2/" + group.replace(".", "/") + "/${name}/$version/${name}-$version" path = "https://repo.maven.apache.org/maven2/" + group.replace(".", "/") + "/${name}/$version/${name}-$version"
if (it.classifier != null && it.classifier != "no_aop") { if (it.classifier != null && it.classifier != "no_aop") {

1
runelite-client/runelite-client.gradle.kts
View File

@@ -92,7 +92,6 @@ dependencies {
implementation(group = "net.runelite.jocl", name = "jocl", version = "1.0") implementation(group = "net.runelite.jocl", name = "jocl", version = "1.0")
runtimeOnly(project(":runescape-api")) runtimeOnly(project(":runescape-api"))
runtimeOnly(project(":injected-client"))
runtimeOnly(group = "net.runelite.pushingpixels", name = "trident", version = "1.5.00") runtimeOnly(group = "net.runelite.pushingpixels", name = "trident", version = "1.5.00")
runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20220318", classifier = "natives-linux-amd64") runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20220318", classifier = "natives-linux-amd64")
runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20220318", classifier = "natives-windows-amd64") runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20220318", classifier = "natives-windows-amd64")