LaunchServer/build.gradle

@@ -13,24 +13,20 @@
     maven {
         url "https://jitpack.io/"
     }
-    maven {
-        url 'https://maven.gravit-support.ru/repository/jitpack'
-        credentials {
-            username = 'gravitlauncher'
-            password = 'gravitlauncher'
-        }
-    }
 }
 
 sourceCompatibility = '21'
 targetCompatibility = '21'
 
 configurations {
+    compileOnlyA
     bundleOnly
     bundle
+    hikari
     pack
+    launch4j
     bundleOnly.extendsFrom bundle
-    api.extendsFrom bundle, pack
+    api.extendsFrom bundle, hikari, pack, launch4j
 }
 
 jar {
@@ -85,13 +81,6 @@ pack project(':LauncherAPI')
     bundle group: 'io.netty', name: 'netty-transport-classes-epoll', version: rootProject['verNetty']
     bundle group: 'io.netty', name: 'netty-transport-native-epoll', version: rootProject['verNetty'], classifier: 'linux-x86_64'
     bundle group: 'io.netty', name: 'netty-transport-native-epoll', version: rootProject['verNetty'], classifier: 'linux-aarch_64'
-    bundle group: 'io.netty', name: 'netty-transport-classes-io_uring', version: rootProject['verNetty']
-    bundle group: 'io.netty', name: 'netty-transport-native-io_uring', version: rootProject['verNetty'], classifier: 'linux-x86_64'
-    bundle group: 'io.netty', name: 'netty-transport-native-io_uring', version: rootProject['verNetty'], classifier: 'linux-aarch_64'
-    // Netty
-    bundle 'org.jboss.marshalling:jboss-marshalling:1.4.11.Final'
-    bundle 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
-    //
     bundle group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j']
     bundle group: 'com.mysql', name: 'mysql-connector-j', version: rootProject['verMySQLConn']
     bundle group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: rootProject['verMariaDBConn']
@@ -107,26 +96,40 @@ pack project(':LauncherAPI')
     annotationProcessor(group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j'])
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
 
-    bundle 'io.micrometer:micrometer-core:1.14.4'
-    bundle('com.zaxxer:HikariCP:6.2.1') {
+    hikari 'io.micrometer:micrometer-core:1.13.1'
+    hikari('com.zaxxer:HikariCP:5.1.0') {
         exclude group: 'javassist'
         exclude group: 'io.micrometer'
         exclude group: 'org.slf4j'
     }
 }
 
+tasks.register('hikari', Copy) {
+    duplicatesStrategy = 'EXCLUDE'
+    into "$buildDir/libs/libraries/hikaricp"
+    from configurations.hikari
+}
+
 tasks.register('dumpLibs', Copy) {
     duplicatesStrategy = 'EXCLUDE'
+    dependsOn tasks.hikari
     into "$buildDir/libs/libraries"
     from configurations.bundleOnly
 }
 
+tasks.register('dumpCompileOnlyLibs', Copy) {
+    duplicatesStrategy = 'EXCLUDE'
+    into "$buildDir/libs/launcher-libraries-compile"
+    from configurations.compileOnlyA
+}
+
 tasks.register('bundle', Zip) {
     duplicatesStrategy = 'EXCLUDE'
-    dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.jar
+    dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.jar
     archiveFileName = 'LaunchServer.zip'
     destinationDirectory = file("$buildDir")
     from(tasks.dumpLibs.destinationDir) { into 'libraries' }
+    from(tasks.dumpCompileOnlyLibs.destinationDir) { into 'launcher-libraries-compile' }
     from(tasks.jar)
     from(parent.childProjects.Launcher.tasks.dumpLibs) { into 'launcher-libraries' }
 }
@@ -137,7 +140,7 @@ pack project(':LauncherAPI')
     from parent.childProjects.Launcher.tasks.dumpLibs
 }
 
-assemble.dependsOn tasks.dumpLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar
+assemble.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar
 
 
 publishing {

LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java

@@ -21,7 +21,6 @@
 import pro.gravit.launchserver.modules.events.*;
 import pro.gravit.launchserver.modules.impl.LaunchServerModulesManager;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.socket.SocketCommandServer;
 import pro.gravit.launchserver.socket.handlers.NettyServerSocketHandler;
 import pro.gravit.launchserver.socket.response.auth.ProfilesResponse;
 import pro.gravit.launchserver.socket.response.auth.RestoreResponse;
@@ -86,7 +85,6 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
     public final Path modulesDir;
     public final Path launcherModulesDir;
     public final Path librariesDir;
-    public final Path controlFile;
     /**
      * This object contains runtime configuration
      */
@@ -115,7 +113,6 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
     // Server
     public final CommandHandler commandHandler;
     public final NettyServerSocketHandler nettyServerSocketHandler;
-    public final SocketCommandServer socketCommandServer;
     public final ScheduledExecutorService service;
     public final AtomicBoolean started = new AtomicBoolean(false);
     public final LauncherModuleLoader launcherModuleLoader;
@@ -142,7 +139,6 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
         modulesDir = directories.modules;
         launcherModulesDir = directories.launcherModules;
         librariesDir = directories.librariesDir;
-        controlFile = directories.controlFile;
         this.shardId = shardId;
         if(!Files.isDirectory(launcherPack)) {
             Files.createDirectories(launcherPack);
@@ -194,7 +190,6 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
         }
         launcherModuleLoader.init();
         nettyServerSocketHandler = new NettyServerSocketHandler(this);
-        socketCommandServer = new SocketCommandServer(commandHandler, controlFile);
         if(config.sign.checkCertificateExpired) {
             checkCertificateExpired();
             service.scheduleAtFixedRate(this::checkCertificateExpired, 24, 24, TimeUnit.HOURS);
@@ -358,7 +353,6 @@ public void run() {
                 }
             }));
             CommonHelper.newThread("Command Thread", true, commandHandler).start();
-            CommonHelper.newThread("Socket Command Thread", true, socketCommandServer).start();
             // Sync updates dir
             CommonHelper.newThread("Profiles and updates sync", true, () -> {
                 try {
@@ -467,7 +461,7 @@ public interface LaunchServerConfigManager {
     public static class LaunchServerDirectories {
         public static final String UPDATES_NAME = "updates",
                 TRUSTSTORE_NAME = "truststore", LAUNCHERLIBRARIES_NAME = "launcher-libraries",
-                LAUNCHERLIBRARIESCOMPILE_NAME = "launcher-libraries-compile", LAUNCHERPACK_NAME = "launcher-pack", KEY_NAME = ".keys", MODULES = "modules", LAUNCHER_MODULES = "launcher-modules", LIBRARIES = "libraries", CONTROL_FILE = "control-file";
+                LAUNCHERLIBRARIESCOMPILE_NAME = "launcher-libraries-compile", LAUNCHERPACK_NAME = "launcher-pack", KEY_NAME = ".keys", MODULES = "modules", LAUNCHER_MODULES = "launcher-modules", LIBRARIES = "libraries";
         public Path updatesDir;
         public Path librariesDir;
         public Path launcherLibrariesDir;
@@ -479,7 +473,6 @@ public static class LaunchServerDirectories {
         public Path tmpDir;
         public Path modules;
         public Path launcherModules;
-        public Path controlFile;
 
         public void collect() {
             if (updatesDir == null) updatesDir = getPath(UPDATES_NAME);
@@ -493,7 +486,6 @@ public void collect() {
             if (modules == null) modules = getPath(MODULES);
             if (launcherModules == null) launcherModules = getPath(LAUNCHER_MODULES);
             if (librariesDir == null) librariesDir = getPath(LIBRARIES);
-            if (controlFile == null) controlFile = getPath(CONTROL_FILE);
             if (tmpDir == null)
                 tmpDir = Paths.get(System.getProperty("java.io.tmpdir")).resolve("launchserver-%s".formatted(SecurityHelper.randomStringToken()));
         }

LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java

@@ -63,7 +63,7 @@ public static void main(String[] args) throws Exception {
         directories.collect();
         CertificateManager certificateManager = new CertificateManager();
         try {
-            certificateManager.readTrustStore(directories.trustStore);
+            certificateManager.readTrustStore(dir.resolve("truststore"));
         } catch (CertificateException e) {
             throw new IOException(e);
         }

LaunchServer/src/main/java/pro/gravit/launchserver/Main.java

@@ -18,7 +18,7 @@
 import java.util.stream.Stream;
 
 public class Main {
-    private static final List<String> classpathOnly = List.of("proguard", "jline", "progressbar", "kotlin");
+    private static final List<String> classpathOnly = List.of("proguard", "jline", "progressbar", "kotlin", "epoll");
     private static final String LOG4J_PROPERTY = "log4j2.configurationFile";
     private static final String DEBUG_PROPERTY = "launchserver.main.debug";
     private static final String LIBRARIES_PROPERTY = "launchserver.dir.libraries";

LaunchServer/src/main/java/pro/gravit/launchserver/auth/HikariSQLSourceConfig.java

@@ -9,22 +9,15 @@
 import java.util.function.Consumer;
 
 public class HikariSQLSourceConfig implements SQLSourceConfig {
-    private transient volatile HikariDataSource dataSource;
+    private transient HikariDataSource dataSource;
     private String dsClass;
     private Properties dsProps;
     private String driverClass;
     private String jdbcUrl;
     private String username;
     private String password;
-    private boolean initializeAtStart;
 
     public void init() {
-        if(initializeAtStart) {
-            initializeConnection();
-        }
-    }
-
-    private void initializeConnection() {
         if (dataSource != null) {
             return;
         }
@@ -41,11 +34,6 @@ private void initializeConnection() {
 
     @Override
     public Connection getConnection() throws SQLException {
-        if(dataSource == null && !initializeAtStart) {
-            synchronized (this) {
-                initializeConnection();
-            }
-        }
         return dataSource.getConnection();
     }
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java

@@ -295,9 +295,7 @@ private SQLUser queryUser(String sql, String value) throws SQLException {
                 user = constructUser(set);
             }
         }
-        if(user != null) {
-            user.permissions = requestPermissions(user.uuid.toString());
-        }
+        user.permissions = requestPermissions(user.uuid.toString());
         return user;
     }
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java

@@ -44,7 +44,6 @@ public SQLSourceConfig getSQLConfig() {
     @Override
     public void init(LaunchServer server, AuthProviderPair pair) {
         super.init(server, pair);
-        logger.warn("Method 'mysql' deprecated and may be removed in future release. Please use new 'sql' method: https://gravitlauncher.com/auth");
         String userInfoCols = makeUserCols();
         String hardwareInfoCols = "id, hwDiskId, baseboardSerialNumber, displayId, bitness, totalMemory, logicalProcessors, physicalProcessors, processorMaxFreq, battery, id, graphicCard, banned, publicKey";
         if (sqlFindHardwareByPublicKey == null)

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/PostgresSQLCoreProvider.java

@@ -1,7 +1,5 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.PostgreSQLSourceConfig;
 import pro.gravit.launchserver.auth.SQLSourceConfig;
 
@@ -12,10 +10,4 @@ public class PostgresSQLCoreProvider extends AbstractSQLCoreProvider {
     public SQLSourceConfig getSQLConfig() {
         return postgresSQLHolder;
     }
-
-    @Override
-    public void init(LaunchServer server, AuthProviderPair pair) {
-        super.init(server, pair);
-        logger.warn("Method 'postgresql' deprecated and may be removed in future release. Please use new 'sql' method: https://gravitlauncher.com/auth");
-    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/SQLCoreProvider.java

@@ -1,27 +1,11 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.HikariSQLSourceConfig;
-import pro.gravit.launchserver.auth.MySQLSourceConfig;
 import pro.gravit.launchserver.auth.SQLSourceConfig;
-import pro.gravit.launchserver.auth.core.interfaces.UserHardware;
-import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportExtendedCheckServer;
-import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportHardware;
-import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportHardware;
-import pro.gravit.launchserver.socket.Client;
-import pro.gravit.utils.helper.IOHelper;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.sql.*;
-import java.util.Base64;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
-public class SQLCoreProvider extends AbstractSQLCoreProvider implements AuthSupportHardware, AuthSupportExtendedCheckServer {
+public class SQLCoreProvider extends AbstractSQLCoreProvider {
     public HikariSQLSourceConfig holder;
 
     @Override
@@ -30,364 +14,14 @@ public void close() {
         holder.close();
     }
 
-    @Override
-    public SQLSourceConfig getSQLConfig() {
-        return holder;
-    }
-
-
-    public String hardwareIdColumn;
-    public String tableHWID = "hwids";
-    public String tableHWIDLog = "hwidLog";
-    public double criticalCompareLevel = 1.0;
-    private transient String sqlFindHardwareByPublicKey;
-    private transient String sqlFindHardwareByData;
-    private transient String sqlFindHardwareById;
-    private transient String sqlCreateHardware;
-    private transient String sqlCreateHWIDLog;
-    private transient String sqlUpdateHardwarePublicKey;
-    private transient String sqlUpdateHardwareBanned;
-    private transient String sqlUpdateUsers;
-    private transient String sqlUsersByHwidId;
-
     @Override
     public void init(LaunchServer server, AuthProviderPair pair) {
         holder.init();
         super.init(server, pair);
-        String userInfoCols = makeUserCols();
-        String hardwareInfoCols = "id, hwDiskId, baseboardSerialNumber, displayId, bitness, totalMemory, logicalProcessors, physicalProcessors, processorMaxFreq, battery, id, graphicCard, banned, publicKey";
-        if (sqlFindHardwareByPublicKey == null)
-            sqlFindHardwareByPublicKey = "SELECT %s FROM %s WHERE publicKey = ?".formatted(hardwareInfoCols, tableHWID);
-        if (sqlFindHardwareById == null)
-            sqlFindHardwareById = "SELECT %s FROM %s WHERE id = ?".formatted(hardwareInfoCols, tableHWID);
-        if (sqlUsersByHwidId == null)
-            sqlUsersByHwidId = "SELECT %s FROM %s WHERE %s = ?".formatted(userInfoCols, table, hardwareIdColumn);
-        if (sqlFindHardwareByData == null)
-            sqlFindHardwareByData = "SELECT %s FROM %s".formatted(hardwareInfoCols, tableHWID);
-        if (sqlCreateHardware == null)
-            sqlCreateHardware = "INSERT INTO %s (publickey, hwDiskId, baseboardSerialNumber, displayId, bitness, totalMemory, logicalProcessors, physicalProcessors, processorMaxFreq, graphicCard, battery, banned) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '0')".formatted(tableHWID);
-        if (sqlCreateHWIDLog == null)
-            sqlCreateHWIDLog = "INSERT INTO %s (hwidId, newPublicKey) VALUES (?, ?)".formatted(tableHWIDLog);
-        if (sqlUpdateHardwarePublicKey == null)
-            sqlUpdateHardwarePublicKey = "UPDATE %s SET publicKey = ? WHERE id = ?".formatted(tableHWID);
-        sqlUpdateHardwareBanned = "UPDATE %s SET banned = ? WHERE id = ?".formatted(tableHWID);
-        sqlUpdateUsers = "UPDATE %s SET %s = ? WHERE %s = ?".formatted(table, hardwareIdColumn, uuidColumn);
     }
 
     @Override
-    protected String makeUserCols() {
-        return super.makeUserCols().concat(", ").concat(hardwareIdColumn);
-    }
-
-    @Override
-    protected SQLUser constructUser(ResultSet set) throws SQLException {
-        return set.next() ? new SQLUser(UUID.fromString(set.getString(uuidColumn)), set.getString(usernameColumn),
-                set.getString(accessTokenColumn), set.getString(serverIDColumn), set.getString(passwordColumn), set.getLong(hardwareIdColumn)) : null;
-    }
-
-    private SQLUserHardware fetchHardwareInfo(ResultSet set) throws SQLException, IOException {
-        HardwareReportRequest.HardwareInfo hardwareInfo = new HardwareReportRequest.HardwareInfo();
-        hardwareInfo.hwDiskId = set.getString("hwDiskId");
-        hardwareInfo.baseboardSerialNumber = set.getString("baseboardSerialNumber");
-        byte[] displayId = set.getBytes("displayId");
-        hardwareInfo.displayId = displayId == null ? null : displayId;
-        hardwareInfo.bitness = set.getInt("bitness");
-        hardwareInfo.totalMemory = set.getLong("totalMemory");
-        hardwareInfo.logicalProcessors = set.getInt("logicalProcessors");
-        hardwareInfo.physicalProcessors = set.getInt("physicalProcessors");
-        hardwareInfo.processorMaxFreq = set.getLong("processorMaxFreq");
-        hardwareInfo.battery = set.getBoolean("battery");
-        hardwareInfo.graphicCard = set.getString("graphicCard");
-        byte[] publicKey = set.getBytes("publicKey");
-        long id = set.getLong("id");
-        boolean banned = set.getBoolean("banned");
-        return new SQLUserHardware(hardwareInfo, publicKey, id, banned);
-    }
-
-    private void setUserHardwareId(Connection connection, UUID uuid, long hwidId) throws SQLException {
-        PreparedStatement s = connection.prepareStatement(sqlUpdateUsers);
-        s.setLong(1, hwidId);
-        s.setString(2, uuid.toString());
-        s.executeUpdate();
-    }
-
-    @Override
-    public UserHardware getHardwareInfoByPublicKey(byte[] publicKey) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlFindHardwareByPublicKey);
-            s.setBytes(1, publicKey);
-            try (ResultSet set = s.executeQuery()) {
-                if (set.next()) {
-                    connection.commit();
-                    return fetchHardwareInfo(set);
-                } else {
-                    connection.commit();
-                    return null;
-                }
-            }
-        } catch (SQLException | IOException throwables) {
-            logger.error("SQL Error", throwables);
-            return null;
-        }
-    }
-
-    @Override
-    public UserHardware getHardwareInfoByData(HardwareReportRequest.HardwareInfo info) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlFindHardwareByData);
-            try (ResultSet set = s.executeQuery()) {
-                while (set.next()) {
-                    SQLUserHardware hw = fetchHardwareInfo(set);
-                    AuthSupportHardware.HardwareInfoCompareResult result = compareHardwareInfo(hw.getHardwareInfo(), info);
-                    if (result.compareLevel > criticalCompareLevel) {
-                        connection.commit();
-                        return hw;
-                    } else {
-                        connection.commit();
-                    }
-                }
-            }
-        } catch (SQLException | IOException throwables) {
-            logger.error("SQL Error", throwables);
-        }
-        return null;
-    }
-
-    @Override
-    public UserHardware getHardwareInfoById(String id) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlFindHardwareById);
-            s.setLong(1, Long.parseLong(id));
-            try (ResultSet set = s.executeQuery()) {
-                if (set.next()) {
-                    connection.commit();
-                    return fetchHardwareInfo(set);
-                } else {
-                    connection.commit();
-                    return null;
-                }
-            }
-        } catch (SQLException | IOException throwables) {
-            logger.error("SQL Error", throwables);
-            return null;
-        }
-    }
-
-    @Override
-    public UserHardware createHardwareInfo(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlCreateHardware, Statement.RETURN_GENERATED_KEYS);
-            s.setBytes(1, publicKey);
-            s.setString(2, hardwareInfo.hwDiskId);
-            s.setString(3, hardwareInfo.baseboardSerialNumber);
-            s.setBytes(4, hardwareInfo.displayId == null ? null : hardwareInfo.displayId);
-            s.setInt(5, hardwareInfo.bitness);
-            s.setLong(6, hardwareInfo.totalMemory);
-            s.setInt(7, hardwareInfo.logicalProcessors);
-            s.setInt(8, hardwareInfo.physicalProcessors);
-            s.setLong(9, hardwareInfo.processorMaxFreq);
-            s.setString(10, hardwareInfo.graphicCard);
-            s.setBoolean(11, hardwareInfo.battery);
-            s.executeUpdate();
-            try (ResultSet generatedKeys = s.getGeneratedKeys()) {
-                if (generatedKeys.next()) {
-                    //writeHwidLog(connection, generatedKeys.getLong(1), publicKey);
-                    long id = generatedKeys.getLong(1);
-                    connection.commit();
-                    return new SQLUserHardware(hardwareInfo, publicKey, id, false);
-                }
-            }
-            connection.commit();
-            return null;
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-            return null;
-        }
-    }
-
-    @Override
-    public void connectUserAndHardware(UserSession userSession, UserHardware hardware) {
-        AbstractSQLCoreProvider.SQLUserSession SQLUserSession = (AbstractSQLCoreProvider.SQLUserSession) userSession;
-        SQLUser SQLUser = (SQLUser) SQLUserSession.getUser();
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        if (SQLUser.hwidId == SQLUserHardware.id) return;
-        SQLUser.hwidId = SQLUserHardware.id;
-        try (Connection connection = holder.getConnection()) {
-            setUserHardwareId(connection, SQLUser.getUUID(), SQLUserHardware.id);
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-        }
-    }
-
-    @Override
-    public void addPublicKeyToHardwareInfo(UserHardware hardware, byte[] publicKey) {
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        SQLUserHardware.publicKey = publicKey;
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlUpdateHardwarePublicKey);
-            s.setBytes(1, publicKey);
-            s.setLong(2, SQLUserHardware.id);
-            s.executeUpdate();
-            connection.commit();
-        } catch (SQLException e) {
-            logger.error("SQL error", e);
-        }
-    }
-
-    @Override
-    public Iterable<User> getUsersByHardwareInfo(UserHardware hardware) {
-        List<User> users = new LinkedList<>();
-        try (Connection c = holder.getConnection()) {
-            c.setAutoCommit(false);
-            PreparedStatement s = c.prepareStatement(sqlUsersByHwidId);
-            s.setLong(1, Long.parseLong(hardware.getId()));
-            s.setQueryTimeout(MySQLSourceConfig.TIMEOUT);
-            try (ResultSet set = s.executeQuery()) {
-                while (!set.isLast()) {
-                    users.add(constructUser(set));
-                }
-            }
-            c.commit();
-        } catch (SQLException e) {
-            logger.error("SQL error", e);
-            return null;
-        }
-        return users;
-    }
-
-    @Override
-    public void banHardware(UserHardware hardware) {
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        SQLUserHardware.banned = true;
-        try (Connection connection = holder.getConnection()) {
-            PreparedStatement s = connection.prepareStatement(sqlUpdateHardwareBanned);
-            s.setBoolean(1, true);
-            s.setLong(2, SQLUserHardware.id);
-            s.executeUpdate();
-        } catch (SQLException e) {
-            logger.error("SQL Error", e);
-        }
-    }
-
-    @Override
-    public void unbanHardware(UserHardware hardware) {
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        SQLUserHardware.banned = false;
-        try (Connection connection = holder.getConnection()) {
-            PreparedStatement s = connection.prepareStatement(sqlUpdateHardwareBanned);
-            s.setBoolean(1, false);
-            s.setLong(2, SQLUserHardware.id);
-            s.executeUpdate();
-        } catch (SQLException e) {
-            logger.error("SQL error", e);
-        }
-    }
-
-    @Override
-    protected AbstractSQLCoreProvider.SQLUserSession createSession(AbstractSQLCoreProvider.SQLUser user) {
-        return new SQLUserSession(user);
-    }
-
-    @Override
-    public UserSession extendedCheckServer(Client client, String username, String serverID) throws IOException {
-        AbstractSQLCoreProvider.SQLUser user = (AbstractSQLCoreProvider.SQLUser) getUserByUsername(username);
-        if (user == null) {
-            return null;
-        }
-        if (user.getUsername().equals(username) && user.getServerId().equals(serverID)) {
-            return createSession(user);
-        }
-        return null;
-    }
-
-    public class SQLUserSession extends AbstractSQLCoreProvider.SQLUserSession implements UserSessionSupportHardware {
-        private transient SQLUser SQLUser;
-        protected transient SQLUserHardware hardware;
-
-        public SQLUserSession(AbstractSQLCoreProvider.SQLUser user) {
-            super(user);
-            SQLUser = (SQLUser) user;
-        }
-
-        @Override
-        public String getHardwareId() {
-            return SQLUser.hwidId == 0 ? null : String.valueOf(SQLUser.hwidId);
-        }
-
-        @Override
-        public UserHardware getHardware() {
-            if(hardware == null) {
-                hardware = (SQLUserHardware) getHardwareInfoById(String.valueOf(SQLUser.hwidId));
-            }
-            return hardware;
-        }
-    }
-
-    public static class SQLUserHardware implements UserHardware {
-        private final HardwareReportRequest.HardwareInfo hardwareInfo;
-        private final long id;
-        private byte[] publicKey;
-        private boolean banned;
-
-        public SQLUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, long id, boolean banned) {
-            this.hardwareInfo = hardwareInfo;
-            this.publicKey = publicKey;
-            this.id = id;
-            this.banned = banned;
-        }
-
-        @Override
-        public HardwareReportRequest.HardwareInfo getHardwareInfo() {
-            return hardwareInfo;
-        }
-
-        @Override
-        public byte[] getPublicKey() {
-            return publicKey;
-        }
-
-        @Override
-        public String getId() {
-            return String.valueOf(id);
-        }
-
-        @Override
-        public boolean isBanned() {
-            return banned;
-        }
-
-        @Override
-        public String toString() {
-            return "SQLUserHardware{" +
-                    "hardwareInfo=" + hardwareInfo +
-                    ", publicKey=" + (publicKey == null ? null : new String(Base64.getEncoder().encode(publicKey))) +
-                    ", id=" + id +
-                    ", banned=" + banned +
-                    '}';
-        }
-    }
-
-    public static class SQLUser extends AbstractSQLCoreProvider.SQLUser {
-        protected long hwidId;
-
-        public SQLUser(UUID uuid, String username, String accessToken, String serverId, String password, long hwidId) {
-            super(uuid, username, accessToken, serverId, password);
-            this.hwidId = hwidId;
-        }
-
-        @Override
-        public String toString() {
-            return "SQLUser{" +
-                    "uuid=" + uuid +
-                    ", username='" + username + '\'' +
-                    ", permissions=" + permissions +
-                    ", hwidId=" + hwidId +
-                    '}';
-        }
+    public SQLSourceConfig getSQLConfig() {
+        return holder;
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/DebugCommand.java

@@ -32,7 +32,6 @@ public void invoke(String... args) throws Exception {
         boolean value = Boolean.parseBoolean(args[0]);
         LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
         Configuration config = ctx.getConfiguration();
-        config.getWatchManager().setIntervalSeconds(-1);
         LoggerConfig loggerConfig = config.getLoggerConfig("pro.gravit");
         loggerConfig.setLevel(value ? Level.TRACE : Level.DEBUG);
         ctx.updateLoggers();

LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java

@@ -19,7 +19,6 @@
 import pro.gravit.launchserver.components.AuthLimiterComponent;
 import pro.gravit.launchserver.components.Component;
 import pro.gravit.launchserver.components.ProGuardComponent;
-import pro.gravit.launchserver.socket.NettyObjectFactory;
 
 import java.util.*;
 
@@ -65,7 +64,12 @@ public static LaunchServerConfig getDefault(LaunchServer.LaunchServerEnv env) {
         newConfig.netty.fileServerEnabled = true;
         newConfig.netty.binds = new NettyBindAddress[]{new NettyBindAddress("0.0.0.0", 9274)};
         newConfig.netty.performance = new NettyPerformanceConfig();
-        newConfig.netty.performance.mode = NettyObjectFactory.NettyFactoryMode.AUTO;
+        try {
+            newConfig.netty.performance.usingEpoll = Epoll.isAvailable();
+        } catch (Throwable e) {
+            // Epoll class line 51+ catch (Exception) but Error will be thrown by System.load
+            newConfig.netty.performance.usingEpoll = false;
+        } // such as on ARM
         newConfig.netty.performance.bossThread = 2;
         newConfig.netty.performance.workerThread = 8;
         newConfig.netty.performance.schedulerThread = 2;
@@ -273,7 +277,7 @@ public static class NettyConfig {
     }
 
     public static class NettyPerformanceConfig {
-        public NettyObjectFactory.NettyFactoryMode mode = NettyObjectFactory.NettyFactoryMode.AUTO;
+        public boolean usingEpoll;
         public int bossThread;
         public int workerThread;
         public int schedulerThread;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java

@@ -29,7 +29,6 @@
 public class CertificateManager {
     private transient final Logger logger = LogManager.getLogger();
     public LauncherTrustManager trustManager;
-    private Path truststorePath;
 
     public void writePrivateKey(Path file, PrivateKey privateKey) throws IOException {
         writePrivateKey(IOHelper.newWriter(file), privateKey);
@@ -92,7 +91,6 @@ public X509CertificateHolder readCertificate(Reader reader) throws IOException {
     }
 
     public void readTrustStore(Path dir) throws IOException, CertificateException {
-        this.truststorePath = dir;
         if (!IOHelper.isDir(dir)) {
             Files.createDirectories(dir);
             try {
@@ -133,8 +131,4 @@ public LauncherTrustManager.CheckClassResult checkClass(Class<?> clazz) {
         X509Certificate[] certificates = JVMHelper.getCertificates(clazz);
         return trustManager.checkCertificates(certificates, trustManager::stdCertificateChecker);
     }
-
-    public Path getTruststorePath() {
-        return truststorePath;
-    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/socket/LauncherNettyServer.java

@@ -36,9 +36,14 @@ public class LauncherNettyServer implements AutoCloseable {
 
     public LauncherNettyServer(LaunchServer server) {
         LaunchServerConfig.NettyConfig config = server.config.netty;
-        NettyObjectFactory.setMode(config.performance.mode);
+        NettyObjectFactory.setUsingEpoll(config.performance.usingEpoll);
         Logger logger = LogManager.getLogger();
-        logger.info("Netty usage {} transport mode", NettyObjectFactory.getMode());
+        if (config.performance.usingEpoll) {
+            logger.debug("Netty: Epoll enabled");
+        }
+        if (config.performance.usingEpoll && !Epoll.isAvailable()) {
+            logger.error("Epoll is not available: (netty,perfomance.usingEpoll configured wrongly)", Epoll.unavailabilityCause());
+        }
         bossGroup = NettyObjectFactory.newEventLoopGroup(config.performance.bossThread, "LauncherNettyServer.bossGroup");
         workerGroup = NettyObjectFactory.newEventLoopGroup(config.performance.workerThread, "LauncherNettyServer.workerGroup");
         serverBootstrap = new ServerBootstrap();

LaunchServer/src/main/java/pro/gravit/launchserver/socket/NettyObjectFactory.java

@@ -2,60 +2,30 @@
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.ServerChannel;
-import io.netty.channel.epoll.Epoll;
 import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.epoll.EpollIoHandler;
 import io.netty.channel.epoll.EpollServerSocketChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.uring.IoUring;
-import io.netty.channel.uring.IoUringIoHandler;
-import io.netty.channel.uring.IoUringServerSocketChannel;
 
 public class NettyObjectFactory {
-    private static NettyFactoryMode mode;
+    private static boolean epoll = false;
 
-    public static void setMode(NettyFactoryMode mode) {
-        NettyObjectFactory.mode = mode;
-        if(mode == NettyFactoryMode.AUTO) {
-            if(IoUring.isAvailable()) {
-                NettyObjectFactory.mode = NettyFactoryMode.IO_URING;
-                return;
-            }
-            if(Epoll.isAvailable()) {
-                NettyObjectFactory.mode = NettyFactoryMode.EPOLL;
-                return;
-            }
-            NettyObjectFactory.mode = NettyFactoryMode.NIO;
-        }
-    }
-
-    public static NettyFactoryMode getMode() {
-        return mode;
+    public static void setUsingEpoll(boolean value) {
+        epoll = value;
     }
 
     public static EventLoopGroup newEventLoopGroup(int threads, String poolName) {
-        return switch (mode) {
-            case AUTO -> null;
-            case NIO -> new MultiThreadIoEventLoopGroup(threads, NioIoHandler.newFactory());
-            case EPOLL -> new MultiThreadIoEventLoopGroup(threads, EpollIoHandler.newFactory());
-            case IO_URING -> new MultiThreadIoEventLoopGroup(threads, IoUringIoHandler.newFactory());
-        };
+        if (epoll)
+            return new EpollEventLoopGroup(threads);
+        else
+            return new NioEventLoopGroup(threads);
     }
 
     public static ChannelFactory<? extends ServerChannel> getServerSocketChannelFactory() {
-        return switch (mode) {
-            case AUTO -> null;
-            case NIO -> NioServerSocketChannel::new;
-            case EPOLL -> EpollServerSocketChannel::new;
-            case IO_URING -> IoUringServerSocketChannel::new;
-        };
-    }
-
-    public enum NettyFactoryMode {
-        AUTO, NIO, EPOLL, IO_URING
+        if (epoll)
+            return EpollServerSocketChannel::new;
+        else
+            return NioServerSocketChannel::new;
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/socket/SocketCommandServer.java

@@ -1,96 +0,0 @@
-package pro.gravit.launchserver.socket;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import pro.gravit.launchserver.config.log4j.LogAppender;
-import pro.gravit.utils.command.CommandHandler;
-
-import java.io.IOException;
-import java.net.StandardProtocolFamily;
-import java.net.UnixDomainSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class SocketCommandServer implements Runnable {
-    private final Logger logger = LogManager.getLogger(SocketCommandServer.class);
-    private ServerSocketChannel channel;
-    private Path path;
-    private UnixDomainSocketAddress address;
-    private ServerSocketChannel serverChannel;
-    private CommandHandler commandHandler;
-    private transient SocketChannel clientChannel;
-
-    public SocketCommandServer(CommandHandler commandHandler, Path path) {
-        this.commandHandler = commandHandler;
-        this.path = path;
-    }
-
-    private void runCommand(SocketChannel channel, String command) {
-        logger.info("Command '{}' from socket", command);
-        clientChannel = channel;
-        try {
-            commandHandler.evalNative(command, false);
-        } catch (Throwable e) {
-            logger.error("Error when execute command", e);
-        } finally {
-            clientChannel = null;
-
-        }
-    }
-
-    @Override
-    public void run() {
-        try {
-            Files.deleteIfExists(path);
-            this.address = UnixDomainSocketAddress.of(path);
-            serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
-            serverChannel.configureBlocking(true);
-            serverChannel.bind(address);
-            LogAppender.getInstance().addListener((logEvent -> {
-                if(clientChannel != null && clientChannel.isOpen()) {
-                    try {
-                        String s = logEvent.getMessage().getFormattedMessage()+"\n";
-                        byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
-                        ByteBuffer buffer = ByteBuffer.wrap(bytes);
-                        clientChannel.write(buffer);
-                    } catch (Throwable ignored) {
-                    }
-                }
-            }));
-            ByteBuffer buffer = ByteBuffer.allocate(1024);
-            while (true) {
-                SocketChannel channel = serverChannel.accept();
-                channel.configureBlocking(true);
-                String command = null;
-                try {
-                    mark:
-                    while (true) {
-                        int bytesRead = channel.read(buffer);
-                        if (bytesRead < 0) {
-                            break;
-                        }
-                        for (var i=0;i<buffer.limit();i++) {
-                            if(buffer.get(i) == '\n') {
-                                command = new String(buffer.array(), 0, i);
-                                break mark;
-                            }
-                        }
-
-                    }
-                    if(command != null) {
-                        runCommand(channel, command);
-                    }
-                } finally {
-                    buffer.clear();
-                    channel.close();
-                }
-            }
-        } catch (Throwable e) {
-            logger.error("Unix command socket server error", e);
-        }
-    }
-}

LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java

@@ -141,6 +141,7 @@ public void cancel() {
             }
         }
         tasks.clear();
+        executor.shutdownNow();
     }
 
     public boolean isCanceled() {

LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java

@@ -88,7 +88,7 @@ private static void realMain(String[] args) throws Throwable {
         ClientParams params = readParams(new InetSocketAddress("127.0.0.1", Launcher.getConfig().clientPort));
         ClientLauncherMethods.verifyNoAgent();
         if(params.timestamp > System.currentTimeMillis() || params.timestamp + 30*1000 < System.currentTimeMillis() ) {
-            LogHelper.error("Timestamp failed: current %d | params %d | diff %d", System.currentTimeMillis(), params.timestamp, System.currentTimeMillis() - params.timestamp);
+            LogHelper.error("Timestamp failed. Exit");
             ClientLauncherMethods.exitLauncher(-662);
             return;
         }

LauncherCore/src/main/java/pro/gravit/utils/Version.java

@@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
 
     public static final int MAJOR = 5;
     public static final int MINOR = 6;
-    public static final int PATCH = 10;
+    public static final int PATCH = 6;
     public static final int BUILD = 1;
     public static final Version.Type RELEASE = Type.STABLE;
     public final int major;

LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java

@@ -10,18 +10,8 @@
 import java.util.Map;
 
 public abstract class CommandHandler implements Runnable {
-    protected final List<Category> categories;
-    protected final CommandCategory baseCategory;
-
-    public CommandHandler() {
-        this.categories = new ArrayList<>();
-        this.baseCategory = new BaseCommandCategory();
-    }
-
-    protected CommandHandler(List<Category> categories, CommandCategory baseCategory) {
-        this.categories = categories;
-        this.baseCategory = baseCategory;
-    }
+    private final List<Category> categories = new ArrayList<>();
+    private final CommandCategory baseCategory = new BaseCommandCategory();
 
     public void eval(String line, boolean bell) {
         LogHelper.info("Command '%s'", line);

LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java

@@ -5,8 +5,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
 
 public class StdCommandHandler extends CommandHandler {
     private final BufferedReader reader;
@@ -16,31 +14,6 @@ public StdCommandHandler(boolean readCommands) {
         reader = readCommands ? IOHelper.newReader(System.in) : null;
     }
 
-    public StdCommandHandler(InputStream stream) {
-        super();
-        this.reader = IOHelper.newReader(stream);
-    }
-
-    public StdCommandHandler(BufferedReader reader) {
-        super();
-        this.reader = reader;
-    }
-
-    protected StdCommandHandler(List<Category> categories, CommandCategory baseCategory, boolean readCommands) {
-        super(categories, baseCategory);
-        this.reader = readCommands ? IOHelper.newReader(System.in) : null;
-    }
-
-    protected StdCommandHandler(List<Category> categories, CommandCategory baseCategory, InputStream stream) {
-        super(categories, baseCategory);
-        this.reader = IOHelper.newReader(stream);
-    }
-
-    protected StdCommandHandler(List<Category> categories, CommandCategory baseCategory, BufferedReader reader) {
-        super(categories, baseCategory);
-        this.reader = reader;
-    }
-
     @Override
     public void bell() {
     }
@@ -64,16 +37,4 @@ public void clear() throws IOException {
     public String readLine() throws IOException {
         return reader == null ? null : reader.readLine();
     }
-
-    public StdCommandHandler ofHandler(CommandHandler commandHandler, boolean readCommands) {
-        return new StdCommandHandler(commandHandler.categories, commandHandler.baseCategory, readCommands);
-    }
-
-    public StdCommandHandler ofHandler(CommandHandler commandHandler, InputStream stream) {
-        return new StdCommandHandler(commandHandler.categories, commandHandler.baseCategory, stream);
-    }
-
-    public StdCommandHandler ofHandler(CommandHandler commandHandler, BufferedReader reader) {
-        return new StdCommandHandler(commandHandler.categories, commandHandler.baseCategory, reader);
-    }
 }

LauncherCore/src/main/java/pro/gravit/utils/launch/LegacyLaunch.java

@@ -123,9 +123,6 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
 
         @Override
         public String findLibrary(String name) {
-            if(nativePath == null) {
-                return null;
-            }
             return nativePath.concat(IOHelper.PLATFORM_SEPARATOR).concat(JVMHelper.NATIVE_PREFIX).concat(name).concat(JVMHelper.NATIVE_EXTENSION);
         }
 

LauncherCore/src/main/java/pro/gravit/utils/launch/ModuleLaunch.java

@@ -262,9 +262,6 @@ protected Class<?> findClass(String moduleName, String name) {
 
         @Override
         public String findLibrary(String name) {
-            if(nativePath == null) {
-                return null;
-            }
             return nativePath.concat(IOHelper.PLATFORM_SEPARATOR).concat(JVMHelper.NATIVE_PREFIX).concat(name).concat(JVMHelper.NATIVE_EXTENSION);
         }
 

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
     id 'maven-publish'
     id 'signing'
     id 'org.openjfx.javafxplugin' version '0.1.0' apply false
 }
 group = 'pro.gravit.launcher'
-version = '5.6.10'
+version = '5.6.6'
 
 apply from: 'props.gradle'
 
@@ -30,13 +30,6 @@
         maven {
             url "https://jitpack.io/"
         }
-        maven {
-            url 'https://maven.gravit-support.ru/repository/jitpack'
-            credentials {
-                username = 'gravitlauncher'
-                password = 'gravitlauncher'
-            }
-        }
     }
 
     jar {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

modules

@@ -1 +1 @@
-Subproject commit aa5ab332d65dd14ce5321453aa809e30b87a186d
+Subproject commit 65f882bd90623aa1581ad24cfa4f52563ea95bc0

props.gradle

@@ -1,18 +1,18 @@
 project.ext {
-    verAsm = '9.7.1'
-    verNetty = '4.2.0.RC3'
-    verOshiCore = '6.6.6'
-    verJunit = '5.11.4'
+    verAsm = '9.7'
+    verNetty = '4.1.111.Final'
+    verOshiCore = '6.6.2'
+    verJunit = '5.10.2'
     verJansi = '2.4.1'
-    verJline = '3.29.0'
-    verJwt = '0.12.6'
-    verGson = '2.12.1'
-    verBcpkix = '1.80'
-    verSlf4j = '2.0.16'
-    verLog4j = '2.24.3'
-    verMySQLConn = '9.2.0'
-    verMariaDBConn = '3.5.1'
-    verPostgreSQLConn = '42.7.5'
-    verH2Conn = '2.3.232'
-    verProguard = '7.6.1'
+    verJline = '3.26.1'
+    verJwt = '0.12.5'
+    verGson = '2.11.0'
+    verBcpkix = '1.78.1'
+    verSlf4j = '2.0.13'
+    verLog4j = '2.23.1'
+    verMySQLConn = '9.0.0'
+    verMariaDBConn = '3.4.0'
+    verPostgreSQLConn = '42.7.3'
+    verH2Conn = '2.2.224'
+    verProguard = '7.5.0'
 }