MirrorHub/authlib-injector
0
0
Fork 1
mirror of https://github.com/yushijinhun/authlib-injector.git synced 2024-06-02 16:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile warnings & Add git info to build output

Browse source
This commit is contained in:
yushijinhun 2017-12-02 18:15:54 +08:00
parent 6f460b732f
commit 0594dac932
No known key found for this signature in database
GPG key ID: 5BC167F73EA558E4
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
build.gradle
View file

@ -1,6 +1,6 @@
plugins {
id 'com.github.johnrengelman.shadow' version '2.0.1'
id 'com.palantir.git-version' version '0.8.0'
id 'com.palantir.git-version' version '0.10.0'
id 'java'
}
@ -11,21 +11,28 @@ repositories {
dependencies {
compile 'org.ow2.asm:asm:5.2'
compile 'org.yaml:snakeyaml:1.18'
compile 'org.yaml:snakeyaml:1.19'
compileOnly ('net.minecraft:launchwrapper:1.12') {
transitive = false
}
testCompile 'junit:junit:4.12'
}
def gitInfo = versionDetails()
sourceCompatibility = 1.8
version = '1.0.' + (System.getenv('BUILD_NUMBER')?:'0-SNAPSHOT') + '-' + versionDetails().gitHash[0..6]
version = '1.0.' + (System.getenv('BUILD_NUMBER')?:'0-SNAPSHOT') + '-' + gitInfo.gitHashFull[0..6]
if (!gitInfo.isCleanTag) version += '.dirty'
jar {
manifest {
attributes (
'Implementation-Title': project.name,
'Implementation-Version': version,
'Implementation-Vendor': 'to2mbn',
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
'Git-Commit': gitInfo.gitHashFull,
'Git-Branch': gitInfo.branchName,
'Git-IsClean': gitInfo.isCleanTag,
'Premain-Class': 'org.to2mbn.authlibinjector.javaagent.AuthlibInjectorPremain',
'TweakClass': 'org.to2mbn.authlibinjector.tweaker.AuthlibInjectorTweaker'
)
@ -40,3 +47,9 @@ shadowJar {
relocate 'org.yaml.snakeyaml', 'org.to2mbn.authlibinjector.internal.org.yaml.snakeyaml'
relocate 'org.objectweb.asm', 'org.to2mbn.authlibinjector.internal.org.objectweb.asm'
}
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
}
defaultTasks 'clean', 'shadowJar'

4
src/main/java/org/to2mbn/authlibinjector/internal/org/json/JSONObject.java
View file

@ -1214,7 +1214,7 @@ public class JSONObject implements Serializable {
return d;
}
} else {
Long myLong = new Long(string);
Long myLong = Long.valueOf(string);
if (string.equals(myLong.toString())) {
if (myLong.longValue() == myLong.intValue()) {
return Integer.valueOf(myLong.intValue());
@ -1439,7 +1439,7 @@ public class JSONObject implements Serializable {
Collection<?> coll = (Collection<?>) value;
new JSONArray(coll).write(writer, indentFactor, indent);
} else if (value.getClass().isArray()) {
new JSONArray((Object[])value).write(writer, indentFactor, indent);
new JSONArray((Object[]) value).write(writer, indentFactor, indent);
} else if (value instanceof Number) {
writer.write(numberToString((Number) value));
} else if (value instanceof Boolean) {