From 2b2369a6db633c1342c2de5156f01198bae576ea Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 22 Feb 2021 03:13:53 +0100 Subject: [PATCH] dependencies: Match RL dependencies --- .github/workflows/gradle.yml | 22 ------- build.gradle.kts | 45 +------------- deobfuscator/deobfuscator.gradle.kts | 16 ++--- http-api/http-api.gradle.kts | 19 +++--- injector/injector.gradle.kts | 17 +++--- runelite-api/runelite-api.gradle.kts | 12 ++-- runelite-client/runelite-client.gradle.kts | 58 +++++++++---------- runelite-mixins/runelite-mixins.gradle.kts | 5 +- ...unelite-script-assembler-plugin.gradle.kts | 6 +- runescape-client/runescape-client.gradle.kts | 6 +- wiki-scraper/wiki-scraper.gradle.kts | 14 ++--- 11 files changed, 76 insertions(+), 144 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e9cb4f3619..8d16f9b50c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -26,25 +26,3 @@ jobs: body: This is an auto-generated PR with an updated gradle version labels: automated-pull-request, gradle signoff: false - - update-dependencies: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2.3.4 - - 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: peter-evans/create-pull-request@v3.4.1 - with: - token: ${{ secrets.OpenOSRS }} - author: OpenOSRS - committer: OpenOSRS - branch: GRADLE-DEPS-UPDATE - commit-message: 'gradle: Update gradle dependencies' - title: 'gradle: Update gradle dependencies' - body: This is an auto-generated PR with an updated gradle dependencies - labels: automated-pull-request, gradle - signoff: false diff --git a/build.gradle.kts b/build.gradle.kts index 74c9e1bbd8..016a6f6dcf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask import org.ajoberstar.grgit.Grgit buildscript { @@ -35,14 +34,10 @@ buildscript { } dependencies { classpath("org.ajoberstar.grgit:grgit-core:4.1.0") - classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0") } } plugins { - id("com.adarshr.test-logger") version "2.1.1" apply false - id("com.github.ben-manes.versions") version "0.36.0" - id("se.patrikerdes.use-latest-versions") version "0.2.15" id("org.ajoberstar.grgit") version "4.1.0" application @@ -55,12 +50,6 @@ val localGitCommit = try { "n/a" } -fun isNonStable(version: String): Boolean { - return listOf("ALPHA", "BETA", "RC").any { - version.toUpperCase().contains(it) - } -} - allprojects { group = "com.openosrs" version = ProjectVersions.openosrsVersion @@ -112,7 +101,6 @@ subprojects { } filter { includeModule("net.runelite", "fernflower") - includeModule("com.openosrs.rxrelay3", "rxrelay") } } @@ -121,9 +109,6 @@ subprojects { apply() //apply() - 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("\\", "/") @@ -185,27 +170,13 @@ 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") - } - } - } - } - } } configurations["compileOnly"].extendsFrom(configurations["annotationProcessor"]) } application { - mainClassName = "net.runelite.client.RuneLite" + mainClass.set("net.runelite.client.RuneLite") } tasks { @@ -215,18 +186,4 @@ tasks { classpath = project(":runelite-client").sourceSets.main.get().runtimeClasspath enableAssertions = true } - - named("dependencyUpdates") { - checkForGradleUpdate = false - - resolutionStrategy { - componentSelection { - all { - if (candidate.displayName.contains("fernflower") || isNonStable(candidate.version)) { - reject("Non stable") - } - } - } - } - } } diff --git a/deobfuscator/deobfuscator.gradle.kts b/deobfuscator/deobfuscator.gradle.kts index 62da0b0dca..25b6ae3e94 100644 --- a/deobfuscator/deobfuscator.gradle.kts +++ b/deobfuscator/deobfuscator.gradle.kts @@ -35,23 +35,23 @@ dependencies { deobjars(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString()) deobjars(project(":runescape-client")) - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + implementation(project(":runelite-api")) + implementation(project(":runescape-api")) implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0") implementation(group = "org.ow2.asm", name = "asm", version = "9.0") implementation(group = "org.ow2.asm", name = "asm-util", version = "9.0") 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 = "30.0-jre") - implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") - implementation(project(":runelite-api")) - implementation(project(":runescape-api")) + implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") - runtimeOnly(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") + runtimeOnly(group = "org.slf4j", name = "slf4j-simple", version = "1.7.12") testImplementation(deobjars) - testImplementation(group = "junit", name = "junit", version = "4.13.1") - testImplementation(group = "org.mockito", name = "mockito-core", version = "3.6.0") + testImplementation(group = "junit", name = "junit", version = "4.12") + testImplementation(group = "org.mockito", name = "mockito-core", version = "3.1.0") } tasks { diff --git a/http-api/http-api.gradle.kts b/http-api/http-api.gradle.kts index 642dd7bf0b..0ccafa95e5 100644 --- a/http-api/http-api.gradle.kts +++ b/http-api/http-api.gradle.kts @@ -28,21 +28,20 @@ import org.apache.tools.ant.filters.ReplaceTokens description = "Web API" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") - implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") - implementation(group = "com.google.guava", name = "guava", version = "30.0-jre") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.7") - 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")) + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") + implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "3.7.0") + implementation(group = "org.apache.commons", name = "commons-csv", version = "1.4") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.0") - testImplementation(group = "junit", name = "junit", version = "4.13.1") - testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") + testImplementation(group = "junit", name = "junit", version = "4.12") + testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.12") } tasks { diff --git a/injector/injector.gradle.kts b/injector/injector.gradle.kts index 00c2bb7d3f..d99d51cf46 100644 --- a/injector/injector.gradle.kts +++ b/injector/injector.gradle.kts @@ -13,18 +13,21 @@ plugins { dependencies { vanillaDep(group = "net.runelite.rs", name = "vanilla", version = rsversion.toString()) - implementation(gradleApi()) - annotationProcessor("org.projectlombok:lombok:1.18.12") - compileOnly("org.projectlombok:lombok:1.18.12") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") + + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") + + implementation(gradleApi()) - implementation("org.ow2.asm:asm:8.0.1") - implementation("org.ow2.asm:asm-util:8.0.1") - implementation("org.jetbrains:annotations:19.0.0") - implementation("com.google.guava:guava:29.0-jre") implementation(project(":deobfuscator")) implementation(project(":runescape-api")) implementation(project(":runescape-client")) implementation(project(":runelite-mixins")) + + 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 = "org.jetbrains", name = "annotations", version = "19.0.0") + implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") } tasks.register("inject") { diff --git a/runelite-api/runelite-api.gradle.kts b/runelite-api/runelite-api.gradle.kts index 9cb15fe98d..3f24b5b9d5 100644 --- a/runelite-api/runelite-api.gradle.kts +++ b/runelite-api/runelite-api.gradle.kts @@ -26,14 +26,14 @@ description = "RuneLite API" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2") - implementation(group = "com.google.guava", name = "guava", version = "30.0-jre") - implementation(group = "org.apache.commons", name = "commons-text", version = "1.9") - implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") + implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") + implementation(group = "org.apache.commons", name = "commons-text", version = "1.2") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") - testImplementation(group = "junit", name = "junit", version = "4.13.1") + testImplementation(group = "junit", name = "junit", version = "4.12") } \ No newline at end of file diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts index cfc8667c28..adc413c31c 100644 --- a/runelite-client/runelite-client.gradle.kts +++ b/runelite-client/runelite-client.gradle.kts @@ -43,50 +43,46 @@ apply() description = "RuneLite Client" dependencies { - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") annotationProcessor(group = "org.pf4j", name = "pf4j", version = "3.5.0") api(project(":runelite-api")) compileOnly(group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2") - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") compileOnly(group = "net.runelite", name = "orange-extensions", version = "1.0") + implementation(project(":http-api")) 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 = "30.0-jre") - implementation(group = "com.google.inject", name = "guice", version = "4.2.3", classifier = "no_aop") + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") + implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") + implementation(group = "com.google.inject", name = "guice", version = "4.1.0", classifier = "no_aop") implementation(group = "com.h2database", name = "h2", version = "1.4.200") implementation(group = "com.jakewharton.rxrelay3", name = "rxrelay", version = "3.0.0") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0") - implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.7") - implementation(group = "net.java.dev.jna", name = "jna", version = "5.6.0") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "3.7.0") + implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.10") + implementation(group = "net.java.dev.jna", name = "jna", version = "4.5.1") implementation(group = "org.jgroups", name = "jgroups", version = "5.0.4.Final") - implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.6.0") - implementation(group = "net.runelite", name = "discord", version = "1.2") - 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.9") + implementation(group = "net.java.dev.jna", name = "jna-platform", version = "4.5.1") + implementation(group = "net.runelite", name = "discord", version = "1.4") + implementation(group = "net.runelite.pushingpixels", name = "substance", version = "8.0.02") + implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.1") + implementation(group = "org.apache.commons", name = "commons-text", version = "1.2") implementation(group = "commons-io", name = "commons-io", version = "2.8.0") implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0") - implementation(group = "org.jooq", name = "jooq", version = "3.14.3") - implementation(group = "org.jooq", name = "jooq-codegen", version = "3.14.3") - implementation(group = "org.jooq", name = "jooq-meta", version = "3.14.3") - implementation(group = "io.sentry", name = "sentry-logback", version = "3.1.3") 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.5.0") { + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") + implementation(group = "org.pf4j", name = "pf4j", version = "3.6.0") { exclude(group = "org.slf4j") } implementation(group = "org.pf4j", name = "pf4j-update", version = "2.3.0") implementation(group = "com.google.archivepatcher", name = "archive-patch-applier", version= "1.0.4") - implementation(project(":http-api")) implementation(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20200429") implementation(group = "net.runelite.jogl", name = "jogl-all", version = "2.4.0-rc-20200429") implementation(group = "net.runelite.jocl", name = "jocl", version = "1.0") - runtimeOnly(group = "org.pushing-pixels", name = "radiance-trident", version = "2.5.1") runtimeOnly(project(":runescape-api")) + runtimeOnly(group = "net.runelite.pushingpixels", name = "trident", version = "1.5.00") runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20200429", classifier = "natives-linux-amd64") runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20200429", classifier = "natives-windows-amd64") runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20200429", classifier = "natives-windows-i586") @@ -98,18 +94,18 @@ dependencies { runtimeOnly(group = "net.runelite.jocl", name = "jocl", version = "1.0", classifier = "macos-x64") runtimeOnly(group = "net.runelite.jocl", name = "jocl", version = "1.0", classifier = "macos-arm64") - testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") - testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") - 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.1") - testImplementation(group = "org.mockito", name = "mockito-core", version = "3.6.0") - testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.6.0") - testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.0") - testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") + testImplementation(group = "com.google.inject.extensions", name = "guice-grapher", version = "4.1.0") + testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.1.0") + testImplementation(group = "org.hamcrest", name = "hamcrest-library", version = "1.3") + testImplementation(group = "junit", name = "junit", version = "4.12") + testImplementation(group = "org.mockito", name = "mockito-core", version = "3.1.0") + testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.1.0") + testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "3.7.0") + testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") } fun formatDate(date: Date?) = with(date ?: Date()) { diff --git a/runelite-mixins/runelite-mixins.gradle.kts b/runelite-mixins/runelite-mixins.gradle.kts index 1fe26ca866..c6227a67b6 100644 --- a/runelite-mixins/runelite-mixins.gradle.kts +++ b/runelite-mixins/runelite-mixins.gradle.kts @@ -14,7 +14,6 @@ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -26,9 +25,9 @@ description = "RuneLite Mixins" dependencies { - compileOnly(group = "com.google.guava", name = "guava", version = "30.0-jre") + compileOnly(group = "com.google.guava", name = "guava", version = "23.2-jre") compileOnly(group = "javax.inject", name = "javax.inject", version = "1") - compileOnly(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") + compileOnly(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") compileOnly(group = "commons-io", name = "commons-io", version = "2.8.0") 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 6f92983453..1f129469dc 100644 --- a/runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts +++ b/runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts @@ -32,11 +32,11 @@ dependencies { compileOnly(group = "org.apache.maven.plugin-tools", name = "maven-plugin-annotations", version = "3.6.0") - implementation(group = "com.google.guava", name = "guava", version = "30.0-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")) + implementation(group = "com.google.guava", name = "guava", version = "23.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.12") } tasks { diff --git a/runescape-client/runescape-client.gradle.kts b/runescape-client/runescape-client.gradle.kts index b47321710a..f3615cd1bf 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(group = "junit", name = "junit", version = "4.13.1") - testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") - testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") + testImplementation(group = "junit", name = "junit", version = "4.12") + testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") + testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.12") } tasks { diff --git a/wiki-scraper/wiki-scraper.gradle.kts b/wiki-scraper/wiki-scraper.gradle.kts index 176544d479..79bdfc0f6b 100644 --- a/wiki-scraper/wiki-scraper.gradle.kts +++ b/wiki-scraper/wiki-scraper.gradle.kts @@ -29,16 +29,16 @@ dependencies { api(project(":cache")) api(project(":runelite-api")) - annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") + annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.4") - compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16") + compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.4") - implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6") - implementation(group = "com.google.guava", name = "guava", version = "30.0-jre") + implementation(group = "com.google.code.gson", name = "gson", version = "2.8.5") + implementation(group = "com.google.guava", name = "guava", version = "23.2-jre") implementation(group = "com.github.petitparser", name = "java-petitparser", version = "2.3.1") - implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0") - implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") - implementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30") + implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "3.7.0") + implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.12") + implementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.12") implementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = "5.7.0") }