Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-01 22:14:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Using guava in get links method

Browse source
This commit is contained in:
microwin7 2023-07-07 20:43:48 +03:00
parent cfb7fe1e24
commit b40f819b5c
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/build.gradle
View file

@ -93,6 +93,7 @@ pack project(':LauncherAPI')
bundle group: 'io.jsonwebtoken', name: 'jjwt-api', version: rootProject['verJwt']
bundle group: 'io.jsonwebtoken', name: 'jjwt-impl', version: rootProject['verJwt']
bundle group: 'io.jsonwebtoken', name: 'jjwt-gson', version: rootProject['verJwt']
bundle group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
hikari 'io.micrometer:micrometer-core:1.8.4'
@ -112,7 +113,6 @@ pack project(':LauncherAPI')
launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-win32') { transitive = false }
launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-linux64') { transitive = false }
compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
// Do not update (laggy deps).
compileOnlyA 'log4j:log4j:1.2.17'
compileOnlyA 'org.apache.logging.log4j:log4j-core:2.14.1'

5
LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java
View file

@ -1,5 +1,6 @@
package pro.gravit.launchserver.config;
import com.google.common.net.UrlEscapers;
import io.netty.channel.epoll.Epoll;
import io.netty.handler.logging.LogLevel;
import org.apache.logging.log4j.LogManager;
@ -137,11 +138,11 @@ public void setBinaryName(String binaryName) {
}
public String getLauncherURL() {
return URLEncoder.encode(this.netty.launcherURL.replaceAll("%binaryName%", this.binaryName), StandardCharsets.UTF_8);
return UrlEscapers.urlFragmentEscaper().escape(this.netty.launcherURL.replaceAll("%binaryName%",this.binaryName));
}
public String getLauncherEXEURL() {
return URLEncoder.encode(this.netty.launcherEXEURL.replaceAll("%binaryName%", this.binaryName), StandardCharsets.UTF_8);
return UrlEscapers.urlFragmentEscaper().escape(this.netty.launcherEXEURL.replaceAll("%binaryName%",this.binaryName));
}
public void setEnv(LauncherConfig.LauncherEnvironment env) {

2
props.gradle
View file

@ -3,7 +3,7 @@
verNetty = '4.1.87.Final'
verOshiCore = '6.4.0'
verJunit = '5.9.2'
verGuavaC = '30.1.1-jre'
verGuavaC = '32.1.1-jre'
verJansi = '2.4.0'
verJline = '3.22.0'
verJwt = '0.11.5'