Bump io.github.slimjar from 1.2.1 to 1.2.2 in /Plan (#2043)

* Bump io.github.slimjar from 1.2.1 to 1.2.2 in /Plan

Bumps io.github.slimjar from 1.2.1 to 1.2.2.

---
updated-dependencies:
- dependency-name: io.github.slimjar
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Added vshnv.tech repository for including the slimjar library jar

* use papermc.io/repo for downloading slimjar dependencies

Affects issues:
- Resolved https://github.com/slimjar/slimjar/issues/52
- Resolved https://github.com/slimjar/slimjar/issues/53

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Risto Lahtela <24460436+AuroraLS3@users.noreply.github.com>
This commit is contained in:
dependabot[bot] 2021-08-08 09:21:44 +03:00 committed by GitHub
parent d29a94e6a4
commit e066ff7215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 5 deletions

View File

@ -8,7 +8,7 @@ buildscript {
plugins { plugins {
id "com.github.johnrengelman.shadow" version "7.0.0" apply false id "com.github.johnrengelman.shadow" version "7.0.0" apply false
id "io.github.slimjar" version "1.2.1" apply false id "io.github.slimjar" version "1.2.2" apply false
id "java" id "java"
id "jacoco" id "jacoco"
id "checkstyle" id "checkstyle"
@ -100,6 +100,7 @@ subprojects {
maven { url = "https://repo.md-5.net/content/repositories/snapshots/" } // RedisBungee maven { url = "https://repo.md-5.net/content/repositories/snapshots/" } // RedisBungee
maven { url = "https://repo.velocitypowered.com/snapshots/" } // Velocity maven { url = "https://repo.velocitypowered.com/snapshots/" } // Velocity
maven { url = "https://repo.playeranalytics.net/releases" } // Plan maven { url = "https://repo.playeranalytics.net/releases" } // Plan
maven { url = " https://repo.vshnv.tech/"} // slimjar
} }
dependencies { dependencies {

View File

@ -26,6 +26,7 @@ import com.djrapitops.plan.settings.locale.Locale;
import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.locale.lang.PluginLang;
import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.settings.theme.PlanColorScheme;
import io.github.slimjar.app.builder.ApplicationBuilder; import io.github.slimjar.app.builder.ApplicationBuilder;
import io.github.slimjar.resolver.data.Repository;
import net.playeranalytics.plugin.BukkitPlatformLayer; import net.playeranalytics.plugin.BukkitPlatformLayer;
import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer;
import net.playeranalytics.plugin.scheduling.RunnableFactory; import net.playeranalytics.plugin.scheduling.RunnableFactory;
@ -37,8 +38,10 @@ import org.bukkit.plugin.java.JavaPlugin;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Collections;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -71,6 +74,8 @@ public class Plan extends JavaPlugin implements PlanPlugin {
try { try {
ApplicationBuilder.appending("Plan") ApplicationBuilder.appending("Plan")
.logger((message, args) -> getLogger().log(Level.INFO, message, args)) .logger((message, args) -> getLogger().log(Level.INFO, message, args))
// Use paper repository for downloading slimjar dependencies
.internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/"))))
.downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries"))
.build(); .build();
} catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) {

View File

@ -24,6 +24,7 @@ import com.djrapitops.plan.settings.locale.Locale;
import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.locale.lang.PluginLang;
import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.settings.theme.PlanColorScheme;
import io.github.slimjar.app.builder.ApplicationBuilder; import io.github.slimjar.app.builder.ApplicationBuilder;
import io.github.slimjar.resolver.data.Repository;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.playeranalytics.plugin.BungeePlatformLayer; import net.playeranalytics.plugin.BungeePlatformLayer;
import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer;
@ -33,8 +34,10 @@ import net.playeranalytics.plugin.server.PluginLogger;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Collections;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -62,6 +65,8 @@ public class PlanBungee extends Plugin implements PlanPlugin {
try { try {
ApplicationBuilder.appending("Plan") ApplicationBuilder.appending("Plan")
.logger((message, args) -> getLogger().log(Level.INFO, message, args)) .logger((message, args) -> getLogger().log(Level.INFO, message, args))
// Use paper repository for downloading slimjar dependencies
.internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/"))))
.downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries"))
.build(); .build();
} catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) {

View File

@ -13,6 +13,7 @@ dependencies {
implementation "org.slf4j:slf4j-api:$slf4jVersion" implementation "org.slf4j:slf4j-api:$slf4jVersion"
implementation "com.maxmind.geoip2:geoip2:$geoIpVersion" implementation "com.maxmind.geoip2:geoip2:$geoIpVersion"
implementation "com.google.code.gson:gson:$gsonVersion" implementation "com.google.code.gson:gson:$gsonVersion"
implementation slimjar("1.2.5")
testImplementation project(":api") testImplementation project(":api")
testImplementation "com.google.code.gson:gson:$gsonVersion" testImplementation "com.google.code.gson:gson:$gsonVersion"

View File

@ -30,6 +30,7 @@ import com.djrapitops.plan.settings.locale.lang.PluginLang;
import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.settings.theme.PlanColorScheme;
import com.djrapitops.plan.utilities.logging.ErrorContext; import com.djrapitops.plan.utilities.logging.ErrorContext;
import io.github.slimjar.app.builder.ApplicationBuilder; import io.github.slimjar.app.builder.ApplicationBuilder;
import io.github.slimjar.resolver.data.Repository;
import net.playeranalytics.plugin.NukkitPlatformLayer; import net.playeranalytics.plugin.NukkitPlatformLayer;
import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer;
import net.playeranalytics.plugin.scheduling.RunnableFactory; import net.playeranalytics.plugin.scheduling.RunnableFactory;
@ -37,12 +38,10 @@ import net.playeranalytics.plugin.server.PluginLogger;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -76,6 +75,8 @@ public class PlanNukkit extends PluginBase implements PlanPlugin {
try { try {
ApplicationBuilder.appending("Plan") ApplicationBuilder.appending("Plan")
.logger((message, args) -> Logger.getGlobal().log(Level.INFO, message, args)) .logger((message, args) -> Logger.getGlobal().log(Level.INFO, message, args))
// Use paper repository for downloading slimjar dependencies
.internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/"))))
.downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries"))
.build(); .build();
} catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) {

View File

@ -25,6 +25,7 @@ import com.djrapitops.plan.settings.locale.Locale;
import com.djrapitops.plan.settings.locale.lang.PluginLang; import com.djrapitops.plan.settings.locale.lang.PluginLang;
import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.settings.theme.PlanColorScheme;
import io.github.slimjar.app.builder.ApplicationBuilder; import io.github.slimjar.app.builder.ApplicationBuilder;
import io.github.slimjar.resolver.data.Repository;
import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer;
import net.playeranalytics.plugin.SpongePlatformLayer; import net.playeranalytics.plugin.SpongePlatformLayer;
import net.playeranalytics.plugin.scheduling.RunnableFactory; import net.playeranalytics.plugin.scheduling.RunnableFactory;
@ -48,8 +49,10 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -125,6 +128,8 @@ public class PlanSponge implements PlanPlugin {
try { try {
ApplicationBuilder.appending("Plan") ApplicationBuilder.appending("Plan")
.logger((message, args) -> java.util.logging.Logger.getGlobal().log(Level.INFO, message, args)) .logger((message, args) -> java.util.logging.Logger.getGlobal().log(Level.INFO, message, args))
// Use paper repository for downloading slimjar dependencies
.internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/"))))
.downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries"))
.build(); .build();
} catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) {

View File

@ -32,6 +32,7 @@ import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import io.github.slimjar.app.builder.ApplicationBuilder; import io.github.slimjar.app.builder.ApplicationBuilder;
import io.github.slimjar.resolver.data.Repository;
import net.playeranalytics.plugin.PlatformAbstractionLayer; import net.playeranalytics.plugin.PlatformAbstractionLayer;
import net.playeranalytics.plugin.VelocityPlatformLayer; import net.playeranalytics.plugin.VelocityPlatformLayer;
import net.playeranalytics.plugin.scheduling.RunnableFactory; import net.playeranalytics.plugin.scheduling.RunnableFactory;
@ -43,9 +44,11 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Collections;
import java.util.logging.Level; import java.util.logging.Level;
/** /**
@ -108,6 +111,8 @@ public class PlanVelocity implements PlanPlugin {
try { try {
ApplicationBuilder.appending("Plan") ApplicationBuilder.appending("Plan")
.logger((message, args) -> java.util.logging.Logger.getGlobal().log(Level.INFO, message, args)) .logger((message, args) -> java.util.logging.Logger.getGlobal().log(Level.INFO, message, args))
// Use paper repository for downloading slimjar dependencies
.internalRepositories(Collections.singletonList(new Repository(new URL("https://papermc.io/repo/repository/maven-public/"))))
.downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries")) .downloadDirectoryPath(Paths.get(getDataFolder().getAbsolutePath()).resolve("libraries"))
.build(); .build();
} catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) { } catch (IOException | ReflectiveOperationException | URISyntaxException | NoSuchAlgorithmException e) {