mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-12-23 17:11:39 +03:00
Compare commits
No commits in common. "c6f8793031e5176be9bd483417b3362b3381beee" and "9c359747ea733e9bd57d170ed7499d31ce6cb2a1" have entirely different histories.
c6f8793031
...
9c359747ea
17 changed files with 49 additions and 180 deletions
|
@ -22,7 +22,6 @@ public final class AuthProviderPair {
|
||||||
public transient String name;
|
public transient String name;
|
||||||
public transient Set<String> features;
|
public transient Set<String> features;
|
||||||
public String displayName;
|
public String displayName;
|
||||||
public boolean visible = true;
|
|
||||||
private transient boolean warnOAuthShow = false;
|
private transient boolean warnOAuthShow = false;
|
||||||
|
|
||||||
public AuthProviderPair() {
|
public AuthProviderPair() {
|
||||||
|
|
|
@ -46,7 +46,6 @@ public static void registerProviders() {
|
||||||
providers.register("postgresql", PostgresSQLCoreProvider.class);
|
providers.register("postgresql", PostgresSQLCoreProvider.class);
|
||||||
providers.register("memory", MemoryAuthCoreProvider.class);
|
providers.register("memory", MemoryAuthCoreProvider.class);
|
||||||
providers.register("http", HttpAuthCoreProvider.class);
|
providers.register("http", HttpAuthCoreProvider.class);
|
||||||
providers.register("merge", MergeAuthCoreProvider.class);
|
|
||||||
registredProviders = true;
|
registredProviders = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,90 +0,0 @@
|
||||||
package pro.gravit.launchserver.auth.core;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import pro.gravit.launcher.request.auth.AuthRequest;
|
|
||||||
import pro.gravit.launchserver.LaunchServer;
|
|
||||||
import pro.gravit.launchserver.auth.AuthException;
|
|
||||||
import pro.gravit.launchserver.manangers.AuthManager;
|
|
||||||
import pro.gravit.launchserver.socket.Client;
|
|
||||||
import pro.gravit.launchserver.socket.response.auth.AuthResponse;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class MergeAuthCoreProvider extends AuthCoreProvider {
|
|
||||||
private transient final Logger logger = LogManager.getLogger(MergeAuthCoreProvider.class);
|
|
||||||
public List<String> list = new ArrayList<>();
|
|
||||||
private transient List<AuthCoreProvider> providers = new ArrayList<>();
|
|
||||||
@Override
|
|
||||||
public User getUserByUsername(String username) {
|
|
||||||
for(var core : providers) {
|
|
||||||
var result = core.getUserByUsername(username);
|
|
||||||
if(result != null) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public User getUserByUUID(UUID uuid) {
|
|
||||||
for(var core : providers) {
|
|
||||||
var result = core.getUserByUUID(uuid);
|
|
||||||
if(result != null) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UserSession getUserSessionByOAuthAccessToken(String accessToken) throws OAuthAccessTokenExpired {
|
|
||||||
throw new OAuthAccessTokenExpired(); // Authorization not supported
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AuthManager.AuthReport refreshAccessToken(String refreshToken, AuthResponse.AuthContext context) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext context, AuthRequest.AuthPasswordInterface password, boolean minecraftAccess) throws IOException {
|
|
||||||
throw new AuthException("Authorization not supported");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public User checkServer(Client client, String username, String serverID) throws IOException {
|
|
||||||
for(var core : providers) {
|
|
||||||
var result = core.checkServer(client, username, serverID);
|
|
||||||
if(result != null) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean joinServer(Client client, String username, String accessToken, String serverID) throws IOException {
|
|
||||||
return false; // Authorization not supported
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void init(LaunchServer server) {
|
|
||||||
for(var e : list) {
|
|
||||||
var pair = server.config.auth.get(e);
|
|
||||||
if(pair != null) {
|
|
||||||
providers.add(pair.core);
|
|
||||||
} else {
|
|
||||||
logger.warn("Provider {} not found", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void close() throws IOException {
|
|
||||||
// Providers closed automatically
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -83,7 +83,8 @@ private Path setConfig() {
|
||||||
jre.setMinVersion(server.config.launch4j.minVersion);
|
jre.setMinVersion(server.config.launch4j.minVersion);
|
||||||
if (server.config.launch4j.setMaxVersion)
|
if (server.config.launch4j.setMaxVersion)
|
||||||
jre.setMaxVersion(server.config.launch4j.maxVersion);
|
jre.setMaxVersion(server.config.launch4j.maxVersion);
|
||||||
jre.setPath(System.getProperty("java.home"));
|
jre.setRuntimeBits(Jre.RUNTIME_BITS_64_AND_32);
|
||||||
|
jre.setJdkPreference(Jre.JDK_PREFERENCE_PREFER_JRE);
|
||||||
config.setJre(jre);
|
config.setJre(jre);
|
||||||
|
|
||||||
// Prepare version info (product)
|
// Prepare version info (product)
|
||||||
|
|
|
@ -40,11 +40,11 @@ public String getUsageDescription() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void invoke(String... args) throws Exception {
|
public void invoke(String... args) throws Exception {
|
||||||
verifyArgs(args, 1);
|
verifyArgs(args, 2);
|
||||||
//Version version = Version.byName(args[0]);
|
//Version version = Version.byName(args[0]);
|
||||||
String versionName = args[0];
|
String versionName = args[0];
|
||||||
String dirName = IOHelper.verifyFileName(args[1] != null ? args[1] : "assets");
|
|
||||||
String type = args.length > 2 ? args[2] : "mojang";
|
String type = args.length > 2 ? args[2] : "mojang";
|
||||||
|
String dirName = IOHelper.verifyFileName(args[1]);
|
||||||
Path assetDir = server.updatesDir.resolve(dirName);
|
Path assetDir = server.updatesDir.resolve(dirName);
|
||||||
|
|
||||||
// Create asset dir
|
// Create asset dir
|
||||||
|
|
|
@ -41,14 +41,18 @@ public void invoke(String... args) throws IOException, CommandException {
|
||||||
verifyArgs(args, 2);
|
verifyArgs(args, 2);
|
||||||
//Version version = Version.byName(args[0]);
|
//Version version = Version.byName(args[0]);
|
||||||
String versionName = args[0];
|
String versionName = args[0];
|
||||||
String dirName = IOHelper.verifyFileName(args[1] != null ? args[1] : args[0]);
|
String dirName = IOHelper.verifyFileName(args[1]);
|
||||||
Path clientDir = server.updatesDir.resolve(dirName);
|
Path clientDir = server.updatesDir.resolve(args[1]);
|
||||||
|
|
||||||
boolean isMirrorClientDownload = false;
|
boolean isMirrorClientDownload = false;
|
||||||
if (args.length > 2) {
|
if (args.length > 2) {
|
||||||
isMirrorClientDownload = args[2].equals("mirror");
|
isMirrorClientDownload = args[2].equals("mirror");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Create client dir
|
||||||
|
logger.info("Creating client dir: '{}'", dirName);
|
||||||
|
Files.createDirectory(clientDir);
|
||||||
|
|
||||||
// Download required client
|
// Download required client
|
||||||
logger.info("Downloading client, it may take some time");
|
logger.info("Downloading client, it may take some time");
|
||||||
//HttpDownloader.downloadZip(server.mirrorManager.getDefaultMirror().getClientsURL(version.name), clientDir);
|
//HttpDownloader.downloadZip(server.mirrorManager.getDefaultMirror().getClientsURL(version.name), clientDir);
|
||||||
|
@ -56,25 +60,7 @@ public void invoke(String... args) throws IOException, CommandException {
|
||||||
|
|
||||||
// Create profile file
|
// Create profile file
|
||||||
logger.info("Creaing profile file: '{}'", dirName);
|
logger.info("Creaing profile file: '{}'", dirName);
|
||||||
ClientProfile clientProfile = null;
|
ClientProfile client = null;
|
||||||
if (isMirrorClientDownload) {
|
|
||||||
try {
|
|
||||||
JsonElement clientJson = server.mirrorManager.jsonRequest(null, "GET", "clients/%s.json", versionName);
|
|
||||||
clientProfile = Launcher.gsonManager.configGson.fromJson(clientJson, ClientProfile.class);
|
|
||||||
clientProfile.setTitle(dirName);
|
|
||||||
clientProfile.setDir(dirName);
|
|
||||||
clientProfile.setUUID(UUID.randomUUID());
|
|
||||||
if (clientProfile.getServers() != null) {
|
|
||||||
ClientProfile.ServerProfile serverProfile = clientProfile.getDefaultServerProfile();
|
|
||||||
if (serverProfile != null) {
|
|
||||||
serverProfile.name = dirName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("Filed download clientProfile from mirror: '{}' Generation through MakeProfileHelper", versionName);
|
|
||||||
isMirrorClientDownload = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isMirrorClientDownload) {
|
if (!isMirrorClientDownload) {
|
||||||
try {
|
try {
|
||||||
String internalVersion = versionName;
|
String internalVersion = versionName;
|
||||||
|
@ -89,14 +75,27 @@ public void invoke(String... args) throws IOException, CommandException {
|
||||||
for (MakeProfileHelper.MakeProfileOption option : options) {
|
for (MakeProfileHelper.MakeProfileOption option : options) {
|
||||||
logger.debug("Detected option {}", option.getClass().getSimpleName());
|
logger.debug("Detected option {}", option.getClass().getSimpleName());
|
||||||
}
|
}
|
||||||
clientProfile = MakeProfileHelper.makeProfile(version, dirName, options);
|
client = MakeProfileHelper.makeProfile(version, dirName, options);
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
isMirrorClientDownload = true;
|
isMirrorClientDownload = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (isMirrorClientDownload) {
|
||||||
|
JsonElement clientJson = server.mirrorManager.jsonRequest(null, "GET", "clients/%s.json", versionName);
|
||||||
|
client = Launcher.gsonManager.configGson.fromJson(clientJson, ClientProfile.class);
|
||||||
|
client.setTitle(dirName);
|
||||||
|
client.setDir(dirName);
|
||||||
|
client.setUUID(UUID.randomUUID());
|
||||||
|
if (client.getServers() != null) {
|
||||||
|
ClientProfile.ServerProfile serverProfile = client.getDefaultServerProfile();
|
||||||
|
if (serverProfile != null) {
|
||||||
|
serverProfile.name = dirName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
try (BufferedWriter writer = IOHelper.newWriter(IOHelper.resolveIncremental(server.profilesDir,
|
try (BufferedWriter writer = IOHelper.newWriter(IOHelper.resolveIncremental(server.profilesDir,
|
||||||
dirName, "json"))) {
|
dirName, "json"))) {
|
||||||
Launcher.gsonManager.configGson.toJson(clientProfile, writer);
|
Launcher.gsonManager.configGson.toJson(client, writer);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finished
|
// Finished
|
||||||
|
|
|
@ -23,10 +23,10 @@ public void execute(ChannelHandlerContext ctx, Client client) {
|
||||||
var rca = pair.isSupport(AuthSupportRemoteClientAccess.class);
|
var rca = pair.isSupport(AuthSupportRemoteClientAccess.class);
|
||||||
if (rca != null) {
|
if (rca != null) {
|
||||||
list.add(new GetAvailabilityAuthRequestEvent.AuthAvailability(pair.name, pair.displayName,
|
list.add(new GetAvailabilityAuthRequestEvent.AuthAvailability(pair.name, pair.displayName,
|
||||||
pair.visible, pair.core.getDetails(client), rca.getClientApiUrl(), rca.getClientApiFeatures()));
|
pair.core.getDetails(client), rca.getClientApiUrl(), rca.getClientApiFeatures()));
|
||||||
} else {
|
} else {
|
||||||
list.add(new GetAvailabilityAuthRequestEvent.AuthAvailability(pair.name, pair.displayName,
|
list.add(new GetAvailabilityAuthRequestEvent.AuthAvailability(pair.name, pair.displayName,
|
||||||
pair.visible, pair.core.getDetails(client)));
|
pair.core.getDetails(client)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sendResult(new GetAvailabilityAuthRequestEvent(list));
|
sendResult(new GetAvailabilityAuthRequestEvent(list));
|
||||||
|
|
|
@ -179,7 +179,7 @@ public static void applyBasicOfflineProcessors(OfflineRequestService service) {
|
||||||
service.registerRequestProcessor(GetAvailabilityAuthRequest.class, (r) -> {
|
service.registerRequestProcessor(GetAvailabilityAuthRequest.class, (r) -> {
|
||||||
List<GetAvailabilityAuthRequestEvent.AuthAvailabilityDetails> details = new ArrayList<>();
|
List<GetAvailabilityAuthRequestEvent.AuthAvailabilityDetails> details = new ArrayList<>();
|
||||||
details.add(new AuthLoginOnlyDetails());
|
details.add(new AuthLoginOnlyDetails());
|
||||||
GetAvailabilityAuthRequestEvent.AuthAvailability authAvailability = new GetAvailabilityAuthRequestEvent.AuthAvailability("offline", "Offline Mode", true, details);
|
GetAvailabilityAuthRequestEvent.AuthAvailability authAvailability = new GetAvailabilityAuthRequestEvent.AuthAvailability("offline", "Offline Mode", details);
|
||||||
List<GetAvailabilityAuthRequestEvent.AuthAvailability> list = new ArrayList<>(1);
|
List<GetAvailabilityAuthRequestEvent.AuthAvailability> list = new ArrayList<>(1);
|
||||||
list.add(authAvailability);
|
list.add(authAvailability);
|
||||||
return new GetAvailabilityAuthRequestEvent(list);
|
return new GetAvailabilityAuthRequestEvent(list);
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package pro.gravit.launcher.client;
|
package pro.gravit.launcher.client;
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
import pro.gravit.launcher.profiles.ClientProfile;
|
import pro.gravit.launcher.profiles.ClientProfile;
|
||||||
|
@ -163,13 +162,9 @@ private Result modernPing(HInput input, HOutput output) throws IOException {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse JSON response
|
// Parse JSON response
|
||||||
JsonElement element = JsonParser.parseString(response);
|
JsonObject object = JsonParser.parseString(response).getAsJsonObject();
|
||||||
if(element.isJsonPrimitive()) {
|
|
||||||
throw new IOException(element.getAsString());
|
|
||||||
}
|
|
||||||
JsonObject object = element.getAsJsonObject();
|
|
||||||
if (object.has("error")) {
|
if (object.has("error")) {
|
||||||
throw new IOException(object.get("error").getAsString()); // May be not needed?
|
throw new IOException(object.get("error").getAsString());
|
||||||
}
|
}
|
||||||
JsonObject playersObject = object.get("players").getAsJsonObject();
|
JsonObject playersObject = object.get("players").getAsJsonObject();
|
||||||
int online = playersObject.get("online").getAsInt();
|
int online = playersObject.get("online").getAsInt();
|
||||||
|
|
|
@ -45,23 +45,18 @@ public static class AuthAvailability {
|
||||||
public String name;
|
public String name;
|
||||||
@LauncherNetworkAPI
|
@LauncherNetworkAPI
|
||||||
public String displayName;
|
public String displayName;
|
||||||
|
|
||||||
@LauncherNetworkAPI
|
|
||||||
public boolean visible;
|
|
||||||
@LauncherNetworkAPI
|
@LauncherNetworkAPI
|
||||||
public String apiUrl;
|
public String apiUrl;
|
||||||
@LauncherNetworkAPI
|
@LauncherNetworkAPI
|
||||||
public List<String> apiFeatures;
|
public List<String> apiFeatures;
|
||||||
|
|
||||||
public AuthAvailability(String name, String displayName, boolean visible, List<AuthAvailabilityDetails> details) {
|
public AuthAvailability(String name, String displayName, List<AuthAvailabilityDetails> details) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.displayName = displayName;
|
this.displayName = displayName;
|
||||||
this.visible = visible;
|
|
||||||
this.details = details;
|
this.details = details;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AuthAvailability(String name, String displayName, boolean visible, List<AuthAvailabilityDetails> details, String apiUrl, List<String> apiFeatures) {
|
public AuthAvailability(String name, String displayName, List<AuthAvailabilityDetails> details, String apiUrl, List<String> apiFeatures) {
|
||||||
this.visible = visible;
|
|
||||||
this.details = details;
|
this.details = details;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.displayName = displayName;
|
this.displayName = displayName;
|
||||||
|
|
|
@ -27,21 +27,6 @@ public OptionalView(OptionalView view) {
|
||||||
this.all = view.all;
|
this.all = view.all;
|
||||||
}
|
}
|
||||||
|
|
||||||
public OptionalView(ClientProfile profile, OptionalView old) {
|
|
||||||
this(profile);
|
|
||||||
for(OptionalFile oldFile : old.all) {
|
|
||||||
OptionalFile newFile = findByName(oldFile.name);
|
|
||||||
if(newFile == null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(old.isEnabled(oldFile)) {
|
|
||||||
enable(newFile, old.installInfo.get(oldFile).isManual, (file, status) -> {});
|
|
||||||
} else {
|
|
||||||
disable(newFile, (file, status) -> {});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public <T extends OptionalAction> Set<T> getActionsByClass(Class<T> clazz) {
|
public <T extends OptionalAction> Set<T> getActionsByClass(Class<T> clazz) {
|
||||||
Set<T> results = new HashSet<>();
|
Set<T> results = new HashSet<>();
|
||||||
|
@ -57,19 +42,6 @@ public <T extends OptionalAction> Set<T> getActionsByClass(Class<T> clazz) {
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|
||||||
public OptionalFile findByName(String name) {
|
|
||||||
for(OptionalFile file : all) {
|
|
||||||
if(name.equals(file.name)) {
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isEnabled(OptionalFile file) {
|
|
||||||
return enabled.contains(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Set<OptionalAction> getEnabledActions() {
|
public Set<OptionalAction> getEnabledActions() {
|
||||||
Set<OptionalAction> results = new HashSet<>();
|
Set<OptionalAction> results = new HashSet<>();
|
||||||
for (OptionalFile e : enabled) {
|
for (OptionalFile e : enabled) {
|
||||||
|
|
|
@ -56,7 +56,6 @@ public static void downloadFile(URL url, Path file, Consumer<Integer> chanheTrac
|
||||||
|
|
||||||
public static void downloadZip(URL url, Path dir) throws IOException {
|
public static void downloadZip(URL url, Path dir) throws IOException {
|
||||||
try (ZipInputStream input = IOHelper.newZipInput(url)) {
|
try (ZipInputStream input = IOHelper.newZipInput(url)) {
|
||||||
Files.createDirectory(dir);
|
|
||||||
for (ZipEntry entry = input.getNextEntry(); entry != null; entry = input.getNextEntry()) {
|
for (ZipEntry entry = input.getNextEntry(); entry != null; entry = input.getNextEntry()) {
|
||||||
if (entry.isDirectory()) {
|
if (entry.isDirectory()) {
|
||||||
Files.createDirectory(dir.resolve(IOHelper.toPath(entry.getName())));
|
Files.createDirectory(dir.resolve(IOHelper.toPath(entry.getName())));
|
||||||
|
|
|
@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
|
||||||
|
|
||||||
public static final int MAJOR = 5;
|
public static final int MAJOR = 5;
|
||||||
public static final int MINOR = 3;
|
public static final int MINOR = 3;
|
||||||
public static final int PATCH = 6;
|
public static final int PATCH = 5;
|
||||||
public static final int BUILD = 1;
|
public static final int BUILD = 1;
|
||||||
public static final Version.Type RELEASE = Type.STABLE;
|
public static final Version.Type RELEASE = Type.STABLE;
|
||||||
public final int major;
|
public final int major;
|
||||||
|
|
|
@ -64,7 +64,7 @@ pack project(':LauncherAPI')
|
||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
duplicatesStrategy = 'EXCLUDE'
|
duplicatesStrategy = 'EXCLUDE'
|
||||||
archiveClassifier = null
|
classifier = null
|
||||||
relocate 'io.netty', 'pro.gravit.repackage.io.netty'
|
relocate 'io.netty', 'pro.gravit.repackage.io.netty'
|
||||||
configurations = [project.configurations.pack]
|
configurations = [project.configurations.pack]
|
||||||
exclude 'module-info.class'
|
exclude 'module-info.class'
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
|
id 'com.github.johnrengelman.shadow' version '5.2.0' apply false
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'signing'
|
id 'signing'
|
||||||
id 'org.openjfx.javafxplugin' version '0.0.10' apply false
|
id 'org.openjfx.javafxplugin' version '0.0.10' apply false
|
||||||
}
|
}
|
||||||
group = 'pro.gravit.launcher'
|
group = 'pro.gravit.launcher'
|
||||||
version = '5.3.6'
|
version = '5.3.5'
|
||||||
|
|
||||||
apply from: 'props.gradle'
|
apply from: 'props.gradle'
|
||||||
|
|
||||||
|
|
2
modules
2
modules
|
@ -1 +1 @@
|
||||||
Subproject commit e16960e7eef248a217071638f0e68b14cec09cb8
|
Subproject commit 614aea895f2d3ccbcf311b8058ab7a5f1dcd8602
|
22
props.gradle
22
props.gradle
|
@ -1,20 +1,20 @@
|
||||||
project.ext {
|
project.ext {
|
||||||
verAsm = '9.4'
|
verAsm = '9.3'
|
||||||
verNetty = '4.1.87.Final'
|
verNetty = '4.1.78.Final'
|
||||||
verOshiCore = '6.4.0'
|
verOshiCore = '6.2.1'
|
||||||
verJunit = '5.9.2'
|
verJunit = '5.8.2'
|
||||||
verGuavaC = '30.1.1-jre'
|
verGuavaC = '30.1.1-jre'
|
||||||
verJansi = '2.4.0'
|
verJansi = '2.4.0'
|
||||||
verJline = '3.22.0'
|
verJline = '3.21.0'
|
||||||
verJwt = '0.11.5'
|
verJwt = '0.11.5'
|
||||||
verBcprov = '1.70'
|
verBcprov = '1.70'
|
||||||
verGson = '2.10.1'
|
verGson = '2.9.0'
|
||||||
verBcpkix = '1.70'
|
verBcpkix = '1.70'
|
||||||
verSlf4j = '1.7.36'
|
verSlf4j = '1.7.36'
|
||||||
verLog4j = '2.19.0'
|
verLog4j = '2.17.2'
|
||||||
verMySQLConn = '8.0.32'
|
verMySQLConn = '8.0.29'
|
||||||
verPostgreSQLConn = '42.5.1'
|
verPostgreSQLConn = '42.4.0'
|
||||||
verProguard = '7.3.1'
|
verProguard = '7.2.2'
|
||||||
verLaunch4j = '3.50'
|
verLaunch4j = '3.14'
|
||||||
verHibernate = '5.5.6.Final'
|
verHibernate = '5.5.6.Final'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue