Skip to content

Commit d0cdda0

Browse files
authored
Merge pull request #91 from QuiltMC/develop/1.8.0
Merge 1.8.0 update
2 parents d7e31bc + 2cd0f2c commit d0cdda0

File tree

275 files changed

+17175
-5280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+17175
-5280
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
/testData/classes/jasm/
99
/testData/classes/groovy/
1010
/testData/classes/kt/
11+
bin

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ Typically, the following options will be changed by user, if any: hes, hdc, dgs,
7373
The rest of options can be left as they are: they are aimed at professional reverse engineers.
7474

7575
- rbr (1): hide bridge methods
76-
- rsy (0): hide synthetic class members
76+
- rsy (1): hide synthetic class members
7777
- din (1): decompile inner classes
7878
- dc4 (1): collapse 1.4 class references
7979
- das (1): decompile assertions
8080
- hes (1): hide empty super invocation
8181
- hdc (1): hide empty default constructor
82-
- dgs (0): decompile generic signatures
82+
- dgs (1): decompile generic signatures
8383
- ner (1): assume return not throwing exceptions
8484
- den (1): decompile enumerations
8585
- rgn (1): remove getClass() invocation, when it is part of a qualified new statement

build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ compileJava {
1818
group = 'org.quiltmc'
1919
archivesBaseName = 'quiltflower'
2020

21-
version = '1.7.0'
21+
version = '1.8.0'
2222

2323
def ENV = System.getenv()
2424
version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")
@@ -48,6 +48,8 @@ dependencies {
4848
}
4949

5050
test {
51+
maxHeapSize = "1G"
52+
5153
useJUnitPlatform()
5254
systemProperty "DOT_EXPORT_DIR", System.getProperty("DOT_EXPORT_DIR", null)
5355
systemProperty "DOT_ERROR_EXPORT_DIR", System.getProperty("DOT_ERROR_EXPORT_DIR", null)
@@ -71,7 +73,7 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
7173
it.java.srcDirs file("testData/src/java${version}${suffix.toLowerCase()}")
7274
}
7375
tasks.getByName("compileTestDataJava${version}${suffix}Java") {
74-
destinationDir = file("testData/classes/java${version}${suffix.toLowerCase()}")
76+
destinationDirectory = file("testData/classes/java${version}${suffix.toLowerCase()}")
7577
javaCompiler = javaToolchains.compilerFor {
7678
languageVersion = JavaLanguageVersion.of(version)
7779
}
@@ -86,7 +88,7 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
8688

8789
task compileTestDataJasm(type: JasmCompile) {
8890
source = fileTree("testData/src/jasm/")
89-
destinationDir = file("testData/classes/jasm/")
91+
destinationDirectory = file("testData/classes/jasm/")
9092
options.compilerArgs += ["-g"]
9193
}
9294
task testDataJasmClasses {
@@ -96,12 +98,12 @@ testDataJasmClasses.dependsOn(compileTestDataJasm)
9698
testDataClasses.dependsOn(testDataJasmClasses)
9799

98100
compileTestDataGroovyGroovy {
99-
destinationDir = file("testData/classes/groovy")
101+
destinationDirectory = file("testData/classes/groovy")
100102
}
101103
testDataClasses.dependsOn(testDataGroovyClasses)
102104

103105
compileTestDataKotlinKotlin {
104-
destinationDir = file("testData/classes/kt")
106+
destinationDirectory = file("testData/classes/kt")
105107
}
106108
testDataClasses.dependsOn(testDataKotlinClasses)
107109

@@ -121,7 +123,8 @@ jar {
121123
manifest {
122124
attributes (
123125
'Multi-Release': 'true',
124-
'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
126+
'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler',
127+
'Implementation-Name': "Quiltflower"
125128
)
126129
}
127130
}

gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)