Skip to content

Commit

Permalink
Updated dependencies and tools
Browse files Browse the repository at this point in the history
- Updated Gradle to 5.2.1
- Updated ASM to 7.0
- Updated Log4J to 2.11.2
- Removed artifact deployment from build.gradle
- Removed unnecessary transformer exclusion `net.minecraft.launchwrapper.injector.`
  • Loading branch information
LightWayUp committed Feb 28, 2019
1 parent 94d9869 commit bb8f9f9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 43 deletions.
47 changes: 8 additions & 39 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,22 @@ sourceCompatibility = 1.8

dependencies {
compile 'net.sf.jopt-simple:jopt-simple:5.0.4'
compile 'org.ow2.asm:asm:6.2.1'
compile 'org.ow2.asm:asm-commons:6.2.1'
compile 'org.ow2.asm:asm-util:6.2.1'
compile 'org.ow2.asm:asm-tree:6.2.1'
compile 'org.ow2.asm:asm-analysis:6.2.1'
compile 'org.ow2.asm:asm-xml:6.2.1'
compile 'org.ow2.asm:asm:7.0'
compile 'org.ow2.asm:asm-commons:7.0'
compile 'org.ow2.asm:asm-util:7.0'
compile 'org.ow2.asm:asm-tree:7.0'
compile 'org.ow2.asm:asm-analysis:7.0'
compile 'org.lwjgl.lwjgl:lwjgl:2.9.3'
compile 'org.apache.logging.log4j:log4j-core:2.11.1'
compile 'org.apache.logging.log4j:log4j-api:2.11.1'
compile 'org.apache.logging.log4j:log4j-core:2.11.2'
compile 'org.apache.logging.log4j:log4j-api:2.11.2'
}

task sourcesJar(type: Jar) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
}

artifacts {
archives jar
archives sourcesJar
}

// Enable only if you want to deploy artifact
/*
def repoDir = new File(projectDir, "repo")
repoDir.mkdirs()
uploadArchives {
repositories {
mavenDeployer {
repository(url: "file://" + repoDir.absolutePath)
pom.project {
description 'Minecraft LegacyLauncher'
url 'https://github.com/Mojang/LegacyLauncher'
}
}
}
doLast {
// Purge all annoying files that aren't needed
repoDir.traverse(type: FileType.FILES, nameFilter: ~/.*\.(xml(?:\.sha1)?|md5)$/) {
it.delete()
}
}
}
clean << {
repoDir.deleteDir()
}
*/
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public LaunchClassLoader(URL... sources) {
addTransformerExclusion("org.objectweb.asm.");
addTransformerExclusion("com.google.common.");
addTransformerExclusion("org.bouncycastle.");
addTransformerExclusion("net.minecraft.launchwrapper.injector.");

if (DEBUG_SAVE) {
int x = 1;
Expand Down

0 comments on commit bb8f9f9

Please sign in to comment.