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

gradle: Update gradle dependencies

Browse Source
This commit is contained in:
OpenOSRS
2020-11-10 00:03:42 +00:00
committed by Owain van Brakel
parent 3fb8e68109
commit 8a696b9a25
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -35,14 +35,14 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.ajoberstar.grgit:grgit-core:4.1.0") classpath("org.ajoberstar.grgit:grgit-core:4.1.0")
classpath("com.github.ben-manes:gradle-versions-plugin:0.34.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0")
classpath("com.openosrs:injector-plugin:1.1.7") classpath("com.openosrs:injector-plugin:1.1.7")
} }
} }
plugins { plugins {
id("com.adarshr.test-logger") version "2.1.1" apply false id("com.adarshr.test-logger") version "2.1.1" apply false
id("com.github.ben-manes.versions") version "0.34.0" id("com.github.ben-manes.versions") version "0.36.0"
id("se.patrikerdes.use-latest-versions") version "0.2.15" id("se.patrikerdes.use-latest-versions") version "0.2.15"
id("org.ajoberstar.grgit") version "4.1.0" id("org.ajoberstar.grgit") version "4.1.0"
id("com.simonharrer.modernizer") version "2.1.0-1" apply false id("com.simonharrer.modernizer") version "2.1.0-1" apply false

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

@@ -39,7 +39,7 @@ description = "RuneLite Client"
dependencies { dependencies {
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16") annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
annotationProcessor(group = "org.pf4j", name = "pf4j", version = "3.4.1") annotationProcessor(group = "org.pf4j", name = "pf4j", version = "3.5.0")
api(project(":runelite-api")) api(project(":runelite-api"))
@@ -64,13 +64,13 @@ dependencies {
implementation(group = "org.apache.commons", name = "commons-text", version = "1.9") implementation(group = "org.apache.commons", name = "commons-text", version = "1.9")
implementation(group = "commons-io", name = "commons-io", version = "2.8.0") implementation(group = "commons-io", name = "commons-io", version = "2.8.0")
implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0") implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0")
implementation(group = "org.jooq", name = "jooq", version = "3.14.1") implementation(group = "org.jooq", name = "jooq", version = "3.14.2")
implementation(group = "org.jooq", name = "jooq-codegen", version = "3.14.1") implementation(group = "org.jooq", name = "jooq-codegen", version = "3.14.2")
implementation(group = "org.jooq", name = "jooq-meta", version = "3.14.1") implementation(group = "org.jooq", name = "jooq-meta", version = "3.14.2")
implementation(group = "io.sentry", name = "sentry-logback", version = "3.1.2") 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 = "com.github.zafarkhaja", name = "java-semver", version = "0.9.0")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30") implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
implementation(group = "org.pf4j", name = "pf4j", version = "3.4.1") { implementation(group = "org.pf4j", name = "pf4j", version = "3.5.0") {
exclude(group = "org.slf4j") exclude(group = "org.slf4j")
} }
implementation(group = "org.pf4j", name = "pf4j-update", version = "2.3.0") implementation(group = "org.pf4j", name = "pf4j-update", version = "2.3.0")

10
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java
View File

@@ -120,11 +120,15 @@ class ExternalPf4jPluginManager extends DefaultPluginManager
@Override @Override
public void loadPlugins() public void loadPlugins()
{ {
if (Files.notExists(pluginsRoot) || !Files.isDirectory(pluginsRoot)) for (Path path : pluginsRoots)
{ {
log.warn("No '{}' root", pluginsRoot); if (Files.notExists(path) || !Files.isDirectory(path))
{
log.warn("No '{}' root", path);
return; return;
} }
}
List<Path> pluginPaths = pluginRepository.getPluginPaths(); List<Path> pluginPaths = pluginRepository.getPluginPaths();
@@ -153,7 +157,7 @@ class ExternalPf4jPluginManager extends DefaultPluginManager
{ {
if (!ExternalPluginManager.isDevelopmentMode()) if (!ExternalPluginManager.isDevelopmentMode())
{ {
String plugin = pluginPath.toString().substring(pluginsRoot.toString().length() + 1); String plugin = pluginPath.toString().substring(pluginsRoots.get(0).toString().length() + 1);
duplicatePlugins.add(plugin); duplicatePlugins.add(plugin);
} }
log.error("Could not load plugin {}", pluginPath, e); log.error("Could not load plugin {}", pluginPath, e);