Merge pull request #91 from QuiltMC/develop/1.8.0

Merge 1.8.0 update

.gitignore

@@ -8,3 +8,4 @@
 /testData/classes/jasm/
 /testData/classes/groovy/
 /testData/classes/kt/
+bin

README.md

@@ -73,13 +73,13 @@ Typically, the following options will be changed by user, if any: hes, hdc, dgs,
 The rest of options can be left as they are: they are aimed at professional reverse engineers.
 
 - rbr (1): hide bridge methods
-- rsy (0): hide synthetic class members
+- rsy (1): hide synthetic class members
 - din (1): decompile inner classes
 - dc4 (1): collapse 1.4 class references
 - das (1): decompile assertions
 - hes (1): hide empty super invocation
 - hdc (1): hide empty default constructor
-- dgs (0): decompile generic signatures
+- dgs (1): decompile generic signatures
 - ner (1): assume return not throwing exceptions
 - den (1): decompile enumerations
 - rgn (1): remove getClass() invocation, when it is part of a qualified new statement

build.gradle

@@ -18,7 +18,7 @@ compileJava {
 group = 'org.quiltmc'
 archivesBaseName = 'quiltflower'
 
-version = '1.7.0'
+version = '1.8.0'
 
 def ENV = System.getenv()
 version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")
@@ -48,6 +48,8 @@ dependencies {
 }
 
 test {
+ maxHeapSize = "1G"
+
  useJUnitPlatform()
  systemProperty "DOT_EXPORT_DIR", System.getProperty("DOT_EXPORT_DIR", null)
  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
  it.java.srcDirs file("testData/src/java${version}${suffix.toLowerCase()}")
  }
  tasks.getByName("compileTestDataJava${version}${suffix}Java") {
- destinationDir = file("testData/classes/java${version}${suffix.toLowerCase()}")
+ destinationDirectory = file("testData/classes/java${version}${suffix.toLowerCase()}")
  javaCompiler = javaToolchains.compilerFor {
  languageVersion = JavaLanguageVersion.of(version)
  }
@@ -86,7 +88,7 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
 
 task compileTestDataJasm(type: JasmCompile) {
  source = fileTree("testData/src/jasm/")
- destinationDir = file("testData/classes/jasm/")
+ destinationDirectory = file("testData/classes/jasm/")
  options.compilerArgs += ["-g"]
 }
 task testDataJasmClasses {
@@ -96,12 +98,12 @@ testDataJasmClasses.dependsOn(compileTestDataJasm)
 testDataClasses.dependsOn(testDataJasmClasses)
 
 compileTestDataGroovyGroovy {
- destinationDir = file("testData/classes/groovy")
+ destinationDirectory = file("testData/classes/groovy")
 }
 testDataClasses.dependsOn(testDataGroovyClasses)
 
 compileTestDataKotlinKotlin {
- destinationDir = file("testData/classes/kt")
+ destinationDirectory = file("testData/classes/kt")
 }
 testDataClasses.dependsOn(testDataKotlinClasses)
 
@@ -121,7 +123,8 @@ jar {
  manifest {
  attributes (
  'Multi-Release': 'true',
- 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
+ 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler',
+ 'Implementation-Name': "Quiltflower"
  )
  }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists