gary.tierney
/
openrs2
forked from openrs2/openrs2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Update dependencies

Browse Source 
Signed-off-by: Graham <gpe@openrs2.org>
Graham 4 years ago
parent 37d86af7c1
commit 31689bb7d3
2 changed files with 15 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      buildSrc/src/main/kotlin/Versions.kt
  2. 21
      deob-ast/src/main/kotlin/org/openrs2/deob/ast/Library.kt

4
buildSrc/src/main/kotlin/Versions.kt
Unescape View File

@ -15,7 +15,7 @@ object Versions {
const val h2 = "1.4.200" const val h2 = "1.4.200"
const val inlineLogger = "1.0.3" const val inlineLogger = "1.0.3"
const val jackson = "2.12.1" const val jackson = "2.12.1"
const val javaParser = "3.18.0" const val javaParser = "3.19.0"
const val jdom = "2.0.6" const val jdom = "2.0.6"
const val jgrapht = "1.5.0" const val jgrapht = "1.5.0"
const val jimfs = "1.2" const val jimfs = "1.2"
@ -28,7 +28,7 @@ object Versions {
const val netty = "4.1.59.Final" const val netty = "4.1.59.Final"
const val nettyIoUring = "0.0.4.Final" const val nettyIoUring = "0.0.4.Final"
const val openrs2Natives = "3.2.0" const val openrs2Natives = "3.2.0"
const val postgres = "42.2.18" const val postgres = "42.2.19"
const val shadowPlugin = "6.1.0" const val shadowPlugin = "6.1.0"
const val thymeleaf = "3.0.12.RELEASE" const val thymeleaf = "3.0.12.RELEASE"
const val thymeleafJava8Time = "3.0.4.RELEASE" const val thymeleafJava8Time = "3.0.4.RELEASE"

21
deob-ast/src/main/kotlin/org/openrs2/deob/ast/Library.kt
Unescape View File

@ -2,8 +2,14 @@ package org.openrs2.deob.ast
import com.github.javaparser.ParserConfiguration import com.github.javaparser.ParserConfiguration
import com.github.javaparser.ast.CompilationUnit import com.github.javaparser.ast.CompilationUnit
import com.github.javaparser.printer.PrettyPrinter import com.github.javaparser.printer.DefaultPrettyPrinter
import com.github.javaparser.printer.PrettyPrinterConfiguration import com.github.javaparser.printer.configuration.DefaultConfigurationOption
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption.INDENTATION
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption.INDENT_CASE_IN_SWITCH
import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption.ORDER_IMPORTS
import com.github.javaparser.printer.configuration.Indentation
import com.github.javaparser.printer.configuration.Indentation.IndentType.TABS_WITH_SPACE_ALIGN
import com.github.javaparser.symbolsolver.JavaSymbolSolver import com.github.javaparser.symbolsolver.JavaSymbolSolver
import com.github.javaparser.symbolsolver.resolution.typesolvers.ClassLoaderTypeSolver import com.github.javaparser.symbolsolver.resolution.typesolvers.ClassLoaderTypeSolver
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver
@ -45,12 +51,11 @@ public class Library(
private val PC_ANNOTATION_REGEX = Regex("@Pc\\(([0-9]+)\\)\\s+") private val PC_ANNOTATION_REGEX = Regex("@Pc\\(([0-9]+)\\)\\s+")
private val printer = Function<CompilationUnit, String>( private val printer = Function<CompilationUnit, String>(
PrettyPrinter( DefaultPrettyPrinter(
PrettyPrinterConfiguration() DefaultPrinterConfiguration()
.setIndentType(PrettyPrinterConfiguration.IndentType.TABS_WITH_SPACE_ALIGN) .addOption(DefaultConfigurationOption(INDENTATION, Indentation(TABS_WITH_SPACE_ALIGN, 1)))
.setIndentSize(1) .addOption(DefaultConfigurationOption(INDENT_CASE_IN_SWITCH, false))
.setIndentCaseInSwitch(false) .addOption(DefaultConfigurationOption(ORDER_IMPORTS, true))
.setOrderImports(true)
)::print )::print
).andThen(::stripNewlineAfterPcAnnotation) ).andThen(::stripNewlineAfterPcAnnotation)

Write Preview
Loading…
Cancel
Save