diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3f70d9d599..2e75848632 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v1 - name: Make gradlew executable run: chmod +x ./gradlew - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - name: Update Gradle Wrapper run: ./gradlew wrapper --gradle-version $(curl -s https://api.github.com/repos/gradle/gradle/releases/latest | grep -Po '"name":.*?[^\\]",' | sed -r 's/[\"name:, ]+//g') --distribution-type all --console=plain - name: Create Gradle wrapper update Pull Request @@ -27,3 +23,22 @@ jobs: PULL_REQUEST_BODY: This is an auto-generated PR with an updated gradle version COMMIT_MESSAGE: 'project: Update gradle wrapper' PULL_REQUEST_LABELS: automated-pull-request, gradle + + update-dependencies: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Make gradlew executable + run: chmod +x ./gradlew + - name: Update Gradle Dependencies + run: ./gradlew useLatestVersions --console=plain + - name: Create Gradle dependencies update Pull Request + uses: Owain94/create-pull-request@master + env: + GITHUB_TOKEN: ${{ secrets.Owain }} + PULL_REQUEST_BRANCH: GRADLE-DEPS-UPDATE + PULL_REQUEST_TITLE: 'project: Update gradle dependencies' + PULL_REQUEST_BODY: This is an auto-generated PR with updated gradle dependencies + COMMIT_MESSAGE: 'project: Update gradle dependencies' + PULL_REQUEST_LABELS: automated-pull-request, gradle diff --git a/build.gradle.kts b/build.gradle.kts index 494c7e28e6..ddb6831c01 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,17 +32,17 @@ buildscript { maven(url = "https://raw.githubusercontent.com/open-osrs/hosting/master") } dependencies { - classpath(Plugins.grgitPlugin) - classpath(Plugins.versionsPlugin) - classpath(Plugins.injectorPlugin) + classpath("org.ajoberstar.grgit:grgit-core:4.0.1") + classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") + classpath("com.openosrs:injector-plugin:${ProjectVersions.openosrsInjectorVersion}") } } plugins { - id(Plugins.testLogger.first) version Plugins.testLogger.second apply false - id(Plugins.versions.first) version Plugins.versions.second - id(Plugins.latestVersion.first) version Plugins.latestVersion.second - id(Plugins.grgit.first) version Plugins.grgit.second + id("com.adarshr.test-logger") version "2.0.0" apply false + id("com.github.ben-manes.versions") version "0.28.0" + id("se.patrikerdes.use-latest-versions") version "0.2.13" + id("org.ajoberstar.grgit") version "4.0.1" application } @@ -97,7 +97,9 @@ subprojects { apply() //apply() - apply(plugin = Plugins.testLogger.first) + apply(plugin = "com.adarshr.test-logger") + apply(plugin = "com.github.ben-manes.versions") + apply(plugin = "se.patrikerdes.use-latest-versions") project.extra["gitCommit"] = localGitCommit project.extra["rootPath"] = rootDir.toString().replace("\\", "/") @@ -143,6 +145,20 @@ subprojects { exclude("**/LayoutSolver.java") exclude("**/RoomType.java") } + + named("dependencyUpdates") { + checkForGradleUpdate = false + + resolutionStrategy { + componentSelection { + all { + if (candidate.displayName.contains("fernflower") || isNonStable(candidate.version)) { + reject("Non stable") + } + } + } + } + } } } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index f60ae70ff9..5a7abf86e2 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -28,130 +28,8 @@ object ProjectVersions { const val rlVersion = "1.6.10" const val openosrsVersion = "3.2.1" + const val openosrsInjectorVersion = "1.0.3.1" const val rsversion = 189 const val cacheversion = 165 -} - -object Plugins { - const val grgitPlugin = "org.ajoberstar.grgit:grgit-core:4.0.1" - const val versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.27.0" - const val injectorPlugin = "com.openosrs:injector-plugin:1.0.3.1" - val testLogger = Pair("com.adarshr.test-logger", "2.0.0") - val versions = Pair("com.github.ben-manes.versions", "0.27.0") - val latestVersion = Pair("se.patrikerdes.use-latest-versions", "0.2.13") - val grgit = Pair("org.ajoberstar.grgit", "4.0.1") - val jarTest = Pair("com.github.hauner.jarTest", "1.0.1") - val shadow = Pair("com.github.johnrengelman.shadow", "5.2.0") -} - -object Libraries { - private object Versions { - const val annotations = "19.0.0" - const val antlr = "4.8-1" - const val apacheCommonsCompress = "1.20" - const val apacheCommonsCsv = "1.8" - const val apacheCommonsText = "1.8" - const val asm = "7.3.1" - const val commonsCli = "1.4" - const val discord = "1.1" - const val fernflower = "07082019" - const val findbugs = "3.0.2" - const val gson = "2.8.6" - const val guava = "28.2-jre" - const val guice = "4.2.2" - const val h2 = "1.4.200" - const val hamcrest = "2.2" - const val javagroups = "4.0.0.Final" - const val javax = "1.3.2" - const val javaxInject = "1" - const val jna = "5.5.0" - const val jogamp = "2.3.2" - const val jopt = "5.0.4" - const val jooq = "3.13.0" - const val junit = "4.13" - const val jupiter = "5.6.0" - const val logback = "1.2.3" - const val lombok = "1.18.12" - const val mavenPluginAnnotations = "3.6.0" - const val mavenPluginApi = "3.6.3" - const val mockito = "3.3.3" - const val netty = "4.1.45.Final" - const val okhttp3 = "4.4.0" - const val orangeExtensions = "1.0" - const val petitparser = "2.3.1" - const val pf4j = "3.2.0" - const val pf4jUpdate = "2.3.0" - const val radiance = "2.5.1" - const val rxjava = "3.0.1" - const val rxrelay = "3.0.0-SNAPSHOT" - const val sisu = "0.3.4" - const val sentry = "1.7.30" - const val semver = "0.9.0" - const val slf4j = "1.7.30" - } - - const val annotations = "org.jetbrains:annotations:${Versions.annotations}" - const val antlr = "org.antlr:antlr4-runtime:${Versions.antlr}" - const val apacheCommonsCompress = "org.apache.commons:commons-compress:${Versions.apacheCommonsCompress}" - const val apacheCommonsCsv = "org.apache.commons:commons-csv:${Versions.apacheCommonsCsv}" - const val apacheCommonsText = "org.apache.commons:commons-text:${Versions.apacheCommonsText}" - const val asmAll = "org.ow2.asm:asm:${Versions.asm}" - const val asmUtil = "org.ow2.asm:asm-util:${Versions.asm}" - const val commonsCli = "commons-cli:commons-cli:${Versions.commonsCli}" - const val discord = "net.runelite:discord:${Versions.discord}" - const val fernflower = "net.runelite:fernflower:${Versions.fernflower}" - const val findbugs = "com.google.code.findbugs:jsr305:${Versions.findbugs}" - const val gson = "com.google.code.gson:gson:${Versions.gson}" - const val guava = "com.google.guava:guava:${Versions.guava}" - const val guice = "com.google.inject:guice:${Versions.guice}:no_aop" - const val guiceGrapher = "com.google.inject.extensions:guice-grapher:${Versions.guice}" - const val guiceTestlib = "com.google.inject.extensions:guice-testlib:${Versions.guice}" - const val h2 = "com.h2database:h2:${Versions.h2}" - const val hamcrest = "org.hamcrest:hamcrest-library:${Versions.hamcrest}" - const val javagroups = "org.jgroups:jgroups:${Versions.javagroups}" - const val javax = "javax.annotation:javax.annotation-api:${Versions.javax}" - const val javaxInject = "javax.inject:javax.inject:${Versions.javaxInject}" - const val jna = "net.java.dev.jna:jna:${Versions.jna}" - const val jnaPlatform = "net.java.dev.jna:jna-platform:${Versions.jna}" - const val jogampJogl = "org.jogamp.jogl:jogl-all:${Versions.jogamp}" - const val jogampGluegen = "org.jogamp.gluegen:gluegen-rt:${Versions.jogamp}" - const val jogampGluegenLinuxAmd64 = "org.jogamp.gluegen:gluegen-rt:${Versions.jogamp}:natives-linux-amd64" - const val jogampGluegenLinuxI586 = "org.jogamp.gluegen:gluegen-rt:${Versions.jogamp}:natives-linux-i586" - const val jogampGluegenWindowsAmd64 = "org.jogamp.gluegen:gluegen-rt:${Versions.jogamp}:natives-windows-amd64" - const val jogampGluegenWindowsI586 = "org.jogamp.gluegen:gluegen-rt:${Versions.jogamp}:natives-windows-i586" - const val jogampJoglLinuxAmd64 = "org.jogamp.jogl:jogl-all:${Versions.jogamp}:natives-linux-amd64" - const val jogampJoglLinuxI586 = "org.jogamp.jogl:jogl-all:${Versions.jogamp}:natives-linux-i586" - const val jogampJoglWindowsAmd64 = "org.jogamp.jogl:jogl-all:${Versions.jogamp}:natives-windows-amd64" - const val jogampJoglWindowsI586 = "org.jogamp.jogl:jogl-all:${Versions.jogamp}:natives-windows-i586" - const val jopt = "net.sf.jopt-simple:jopt-simple:${Versions.jopt}" - const val jooq = "org.jooq:jooq:${Versions.jooq}" - const val jooqCodegen = "org.jooq:jooq-codegen:${Versions.jooq}" - const val jooqMeta = "org.jooq:jooq-meta:${Versions.jooq}" - const val junit = "junit:junit:${Versions.junit}" - const val jupiter = "org.junit.jupiter:junit-jupiter-api:${Versions.jupiter}" - const val logback = "ch.qos.logback:logback-classic:${Versions.logback}" - const val lombok = "org.projectlombok:lombok:${Versions.lombok}" - const val mavenPluginAnnotations = "org.apache.maven.plugin-tools:maven-plugin-annotations:${Versions.mavenPluginAnnotations}" - const val mavenPluginApi = "org.apache.maven:maven-plugin-api:${Versions.mavenPluginApi}" - const val mockitoCore = "org.mockito:mockito-core:${Versions.mockito}" - const val mockitoInline = "org.mockito:mockito-inline:${Versions.mockito}" - const val nettyBuffer = "io.netty:netty-buffer:${Versions.netty}" - const val okhttp3 = "com.squareup.okhttp3:okhttp:${Versions.okhttp3}" - const val okhttp3Webserver = "com.squareup.okhttp3:mockwebserver:${Versions.okhttp3}" - const val orangeExtensions = "net.runelite:orange-extensions:${Versions.orangeExtensions}" - const val petitparser = "com.github.petitparser:java-petitparser:${Versions.petitparser}" - const val pf4j = "org.pf4j:pf4j:${Versions.pf4j}" - const val pf4jUpdate = "org.pf4j:pf4j-update:${Versions.pf4jUpdate}" - const val rxjava = "io.reactivex.rxjava3:rxjava:${Versions.rxjava}" - const val rxrelay = "com.openosrs.rxrelay3:rxrelay:${Versions.rxrelay}" - const val sisu = "org.eclipse.sisu:org.eclipse.sisu.inject:${Versions.sisu}" - const val slf4jApi = "org.slf4j:slf4j-api:${Versions.slf4j}" - const val slf4jNop = "org.slf4j:slf4j-nop:${Versions.slf4j}" - const val slf4jSimple = "org.slf4j:slf4j-simple:${Versions.slf4j}" - const val sentry = "io.sentry:sentry-logback:${Versions.sentry}" - const val semver = "com.github.zafarkhaja:java-semver:${Versions.semver}" - const val substance = "org.pushing-pixels:radiance-substance:${Versions.radiance}" - const val trident = "org.pushing-pixels:radiance-trident:${Versions.radiance}" - const val vanilla = "net.runelite.rs:vanilla:${ProjectVersions.rsversion}" -} +} \ No newline at end of file diff --git a/cache/cache.gradle.kts b/cache/cache.gradle.kts index c6545d4777..86f39353ed 100644 --- a/cache/cache.gradle.kts +++ b/cache/cache.gradle.kts @@ -26,31 +26,31 @@ import org.apache.tools.ant.filters.ReplaceTokens plugins { - id(Plugins.jarTest.first) version Plugins.jarTest.second + id("com.github.hauner.jarTest") version "1.0.1" } description = "Cache" dependencies { - annotationProcessor(Libraries.lombok) + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") api(project(":http-api")) - compileOnly(Libraries.lombok) + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - implementation(Libraries.gson) - implementation(Libraries.guava) - implementation(Libraries.commonsCli) - implementation(Libraries.nettyBuffer) - implementation(Libraries.antlr) - implementation(Libraries.apacheCommonsCompress) - implementation(Libraries.slf4jApi) + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") + implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") + implementation(group = "commons-cli", name = "commons-cli", version = "1.4") + implementation(group = "io.netty", name = "netty-buffer", version = "4.1.48.Final") + implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.8-1") + implementation(group = "org.apache.commons", name = "commons-compress", version = "1.20") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") - testAnnotationProcessor(Libraries.lombok) + testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") - testCompileOnly(Libraries.lombok) + testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - testImplementation(Libraries.junit) + testImplementation(group = "junit", name = "junit", version = "4.13") testImplementation(group = "net.runelite.rs", name = "cache", version = "${ProjectVersions.cacheversion}") } diff --git a/deobfuscator/deobfuscator.gradle.kts b/deobfuscator/deobfuscator.gradle.kts index 1758a6f8d3..f09082f605 100644 --- a/deobfuscator/deobfuscator.gradle.kts +++ b/deobfuscator/deobfuscator.gradle.kts @@ -26,7 +26,7 @@ import org.apache.tools.ant.filters.ReplaceTokens plugins { - id(Plugins.jarTest.first) version Plugins.jarTest.second + id("com.github.hauner.jarTest") version "1.0.1" } val deobjars = configurations.create("deobjars") @@ -35,21 +35,21 @@ dependencies { deobjars(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString()) deobjars(project(":runescape-client")) - implementation(Libraries.annotations) - implementation(Libraries.asmAll) - implementation(Libraries.asmUtil) - implementation(Libraries.fernflower) - implementation(Libraries.gson) - implementation(Libraries.guava) - implementation(Libraries.slf4jApi) + implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") + implementation(group = "org.ow2.asm", name = "asm", version = "8.0.1") + implementation(group = "org.ow2.asm", name = "asm-util", version = "8.0.1") + implementation(group = "net.runelite", name = "fernflower", version = "07082019") + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") + implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(project(":runelite-api")) implementation(project(":runescape-api")) - runtimeOnly(Libraries.slf4jSimple) + runtimeOnly(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") testImplementation(deobjars) - testImplementation(Libraries.junit) - testImplementation(Libraries.mockitoCore) + testImplementation(group = "junit", name = "junit", version = "4.13") + testImplementation(group = "org.mockito", name = "mockito-core", version = "3.3.3") } tasks { diff --git a/http-api/http-api.gradle.kts b/http-api/http-api.gradle.kts index 61a19e3008..94890c1458 100644 --- a/http-api/http-api.gradle.kts +++ b/http-api/http-api.gradle.kts @@ -28,22 +28,22 @@ import org.apache.tools.ant.filters.ReplaceTokens description = "Web API" dependencies { - annotationProcessor(Libraries.lombok) + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") - compileOnly(Libraries.javaxInject) - compileOnly(Libraries.lombok) + compileOnly(group = "javax.inject", name = "javax.inject", version = "1") + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - implementation(Libraries.gson) - implementation(Libraries.guava) - implementation(Libraries.okhttp3) - implementation(Libraries.rxjava) - implementation(Libraries.apacheCommonsCsv) - implementation(Libraries.slf4jApi) + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") + implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.5.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.2") + implementation(group = "org.apache.commons", name = "commons-csv", version = "1.8") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(project(":runelite-api")) - testImplementation(Libraries.okhttp3Webserver) - testImplementation(Libraries.junit) - testImplementation(Libraries.slf4jSimple) + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.5.0") + testImplementation(group = "junit", name = "junit", version = "4.13") + testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") } tasks { diff --git a/injected-client/injected-client.gradle.kts b/injected-client/injected-client.gradle.kts index 36f36de1f4..6442589f1b 100644 --- a/injected-client/injected-client.gradle.kts +++ b/injected-client/injected-client.gradle.kts @@ -50,7 +50,7 @@ configurations { } dependencies { - vanillaDep(Libraries.vanilla) + vanillaDep(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString()) rsapiDep(project(":runescape-api")) rsclientDep(project(":runescape-client")) mixinsDep(project(":runelite-mixins")) diff --git a/runelite-api/runelite-api.gradle.kts b/runelite-api/runelite-api.gradle.kts index 2bba4c0595..eb83e0f521 100644 --- a/runelite-api/runelite-api.gradle.kts +++ b/runelite-api/runelite-api.gradle.kts @@ -26,14 +26,14 @@ description = "RuneLite API" dependencies { - annotationProcessor(Libraries.lombok) + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") - compileOnly(Libraries.lombok) + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - implementation(Libraries.findbugs) - implementation(Libraries.guava) - implementation(Libraries.apacheCommonsText) - implementation(Libraries.slf4jApi) + implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2") + implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") + implementation(group = "org.apache.commons", name = "commons-text", version = "1.8") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") - testImplementation(Libraries.junit) + testImplementation(group = "junit", name = "junit", version = "4.13") } \ No newline at end of file diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index 20e51207a5..d9c9dceeda 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -28,7 +28,7 @@ import java.text.SimpleDateFormat import java.util.Date plugins { - id(Plugins.shadow.first) version Plugins.shadow.second + id("com.github.johnrengelman.shadow") version "5.2.0" java } @@ -38,69 +38,69 @@ apply() description = "RuneLite Client" dependencies { - annotationProcessor(Libraries.lombok) - annotationProcessor(Libraries.pf4j) + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") + annotationProcessor(group = "org.pf4j", name = "pf4j", version = "3.2.0") api(project(":runelite-api")) - compileOnly(Libraries.javax) - compileOnly(Libraries.lombok) - compileOnly(Libraries.orangeExtensions) + compileOnly(group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2") + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") + compileOnly(group = "net.runelite", name = "orange-extensions", version = "1.0") - implementation(Libraries.logback) - implementation(Libraries.gson) - implementation(Libraries.guava) - implementation(Libraries.guice) - implementation(Libraries.h2) - implementation(Libraries.rxrelay) - implementation(Libraries.okhttp3) - implementation(Libraries.rxjava) - implementation(Libraries.jna) - implementation(Libraries.javagroups) - implementation(Libraries.jnaPlatform) - implementation(Libraries.discord) - implementation(Libraries.substance) - implementation(Libraries.jopt) - implementation(Libraries.apacheCommonsText) - implementation(Libraries.annotations) - implementation(Libraries.jogampGluegen) - implementation(Libraries.jogampJogl) - implementation(Libraries.jooq) - implementation(Libraries.jooqCodegen) - implementation(Libraries.jooqMeta) - implementation(Libraries.sentry) - implementation(Libraries.semver) - implementation(Libraries.slf4jApi) - implementation(Libraries.pf4j) { + implementation(group = "ch.qos.logback", name = "logback-classic", version = "1.2.3") + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") + implementation(group = "com.google.guava", name = "guava", version = "28.2-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.0-SNAPSHOT") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.5.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.2") + implementation(group = "net.java.dev.jna", name = "jna", version = "5.5.0") + implementation(group = "org.jgroups", name = "jgroups", version = "4.2.1.Final") + implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.5.0") + implementation(group = "net.runelite", name = "discord", version = "1.1") + implementation(group = "org.pushing-pixels", name = "radiance-substance", version = "2.5.1") + implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4") + implementation(group = "org.apache.commons", name = "commons-text", version = "1.8") + implementation(group = "org.jetbrains", name = "annotations", version = "19.0.0") + implementation(group = "org.jogamp.gluegen", name = "gluegen-rt", version = "2.3.2") + implementation(group = "org.jogamp.jogl", name = "jogl-all", version = "2.3.2") + implementation(group = "org.jooq", name = "jooq", version = "3.13.1") + implementation(group = "org.jooq", name = "jooq-codegen", version = "3.13.1") + implementation(group = "org.jooq", name = "jooq-meta", version = "3.13.1") + implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.30") + implementation(group = "com.github.zafarkhaja", name = "java-semver", version = "0.9.0") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") + implementation(group = "org.pf4j", name = "pf4j", version = "3.2.0") { exclude(group = "org.slf4j") } - implementation(Libraries.pf4jUpdate) + implementation(group = "org.pf4j", name = "pf4j-update", version = "2.3.0") implementation(project(":http-api")) - runtimeOnly(Libraries.trident) - runtimeOnly(Libraries.jogampGluegenLinuxAmd64) - runtimeOnly(Libraries.jogampGluegenLinuxI586) - runtimeOnly(Libraries.jogampGluegenWindowsAmd64) - runtimeOnly(Libraries.jogampGluegenWindowsI586) - runtimeOnly(Libraries.jogampJoglLinuxAmd64) - runtimeOnly(Libraries.jogampJoglLinuxI586) - runtimeOnly(Libraries.jogampJoglWindowsAmd64) - runtimeOnly(Libraries.jogampJoglWindowsI586) + runtimeOnly(group = "org.pushing-pixels", name = "radiance-trident", version = "2.5.1") + runtimeOnly(group = "org.jogamp.gluegen", name = "gluegen-rt", version = "2.3.2", classifier = "natives-linux-amd64") + runtimeOnly(group = "org.jogamp.gluegen", name = "gluegen-rt", version = "2.3.2", classifier = "natives-linux-i586") + runtimeOnly(group = "org.jogamp.gluegen", name = "gluegen-rt", version = "2.3.2", classifier = "natives-windows-amd64") + runtimeOnly(group = "org.jogamp.gluegen", name = "gluegen-rt", version = "2.3.2", classifier = "natives-windows-i586") + runtimeOnly(group = "org.jogamp.jogl", name = "jogl-all", version = "2.3.2", classifier = "natives-linux-amd64") + runtimeOnly(group = "org.jogamp.jogl", name = "jogl-all", version = "2.3.2", classifier = "natives-linux-i586") + runtimeOnly(group = "org.jogamp.jogl", name = "jogl-all", version = "2.3.2", classifier = "natives-windows-amd64") + runtimeOnly(group = "org.jogamp.jogl", name = "jogl-all", version = "2.3.2", classifier = "natives-windows-i586") runtimeOnly(project(":injected-client")) runtimeOnly(project(":runescape-api")) - testAnnotationProcessor(Libraries.lombok) + testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") - testCompileOnly(Libraries.lombok) + testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - testImplementation(Libraries.guiceGrapher) - testImplementation(Libraries.guiceTestlib) - testImplementation(Libraries.hamcrest) - testImplementation(Libraries.junit) - testImplementation(Libraries.mockitoCore) - testImplementation(Libraries.mockitoInline) - testImplementation(Libraries.okhttp3Webserver) - testImplementation(Libraries.slf4jApi) + testImplementation(group = "com.google.inject.extensions", name = "guice-grapher", version = "4.2.3") + testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.2.3") + testImplementation(group = "org.hamcrest", name = "hamcrest-library", version = "2.2") + testImplementation(group = "junit", name = "junit", version = "4.13") + testImplementation(group = "org.mockito", name = "mockito-core", version = "3.3.3") + testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.3.3") + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.5.0") + testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") } fun formatDate(date: Date?) = with(date ?: Date()) { diff --git a/runelite-mixins/runelite-mixins.gradle.kts b/runelite-mixins/runelite-mixins.gradle.kts index e3c4c8d12c..9436559d3e 100644 --- a/runelite-mixins/runelite-mixins.gradle.kts +++ b/runelite-mixins/runelite-mixins.gradle.kts @@ -26,9 +26,9 @@ description = "RuneLite Mixins" dependencies { - compileOnly(Libraries.guava) - compileOnly(Libraries.javaxInject) - compileOnly(Libraries.slf4jApi) + compileOnly(group = "com.google.guava", name = "guava", version = "28.2-jre") + compileOnly(group = "javax.inject", name = "javax.inject", version = "1") + compileOnly(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") compileOnly(project(":injection-annotations")) compileOnly(project(":runescape-api")) } diff --git a/runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts b/runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts index b1402a58c5..206024b6a4 100644 --- a/runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts +++ b/runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts @@ -26,13 +26,13 @@ description = "Script Assembler Plugin" dependencies { - annotationProcessor(Libraries.sisu) + annotationProcessor(group = "org.eclipse.sisu", name = "org.eclipse.sisu.inject", version = "0.3.4") - compileOnly(Libraries.mavenPluginAnnotations) + compileOnly(group = "org.apache.maven.plugin-tools", name = "maven-plugin-annotations", version = "3.6.0") - implementation(Libraries.guava) - implementation(Libraries.mavenPluginApi) - implementation(Libraries.slf4jNop) + implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") + implementation(group = "org.apache.maven", name = "maven-plugin-api", version = "3.6.3") + implementation(group = "org.slf4j", name = "slf4j-nop", version = "1.7.30") implementation(project(":cache")) implementation(project(":runelite-api")) } diff --git a/runescape-client/runescape-client.gradle.kts b/runescape-client/runescape-client.gradle.kts index 5086235694..5dc63015fe 100644 --- a/runescape-client/runescape-client.gradle.kts +++ b/runescape-client/runescape-client.gradle.kts @@ -29,9 +29,9 @@ description = "RuneScape Client" dependencies { implementation(project(":injection-annotations")) - testImplementation(Libraries.junit) - testImplementation(Libraries.slf4jApi) - testImplementation(Libraries.slf4jSimple) + testImplementation(group = "junit", name = "junit", version = "4.13") + testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") + testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") } tasks { diff --git a/wiki-scraper/wiki-scraper.gradle.kts b/wiki-scraper/wiki-scraper.gradle.kts index f87457566d..a3b9e0b636 100644 --- a/wiki-scraper/wiki-scraper.gradle.kts +++ b/wiki-scraper/wiki-scraper.gradle.kts @@ -29,18 +29,18 @@ dependencies { api(project(":cache")) api(project(":runelite-api")) - annotationProcessor(Libraries.lombok) + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12") - compileOnly(Libraries.lombok) + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12") - implementation(Libraries.gson) - implementation(Libraries.guava) - implementation(Libraries.petitparser) - implementation(Libraries.okhttp3) - implementation(Libraries.slf4jApi) - implementation(Libraries.slf4jSimple) + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") + implementation(group = "com.google.guava", name = "guava", version = "28.2-jre") + implementation(group = "com.github.petitparser", name = "java-petitparser", version = "2.3.1") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.5.0") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") + implementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") - testImplementation(Libraries.jupiter) + implementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = "5.6.1") } tasks {