Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Col-E committed Oct 21, 2023
1 parent 8cff344 commit 1260283
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
18 changes: 9 additions & 9 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def asmVersion = '9.5'
def asmVersion = '9.6'
def cafeDudeVersion = '1.10.2'
def junitVersion = '5.9.2'
def junitVersion = '5.10.0'

project.ext {
asm = "org.ow2.asm:asm:$asmVersion"
Expand All @@ -12,21 +12,21 @@ project.ext {
// Use our fork of Android's release with fixes and less transitive dependencies
binary_resources = 'com.github.Col-E:binary-resources:31.3.0-alpha01.8'

atlantafx = 'io.github.mkpaz:atlantafx-base:2.0.0'
atlantafx = 'io.github.mkpaz:atlantafx-base:2.0.1'

cafedude = "com.github.Col-E:CAFED00D:$cafeDudeVersion"

cfr = 'org.benf:cfr:0.152'

cdi_api = 'jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1'
cdi_impl = 'org.jboss.weld.se:weld-se-core:5.1.0.Final'
cdi_impl = 'org.jboss.weld.se:weld-se-core:5.1.2.Final'

dex_translator = 'software.coley:dex-translator:1.1.1'

directories = 'dev.dirs:directories:26'
docking = 'com.github.Col-E:tiwulfx-dock:1.2.3'

downgrader = 'com.github.RaphiMC.JavaDowngrader:core:13e29798a8'
downgrader = 'com.github.RaphiMC.JavaDowngrader:core:1.1.1'

extra_collections = 'software.coley:extra-collections:1.2.3'
extra_observables = 'software.coley:extra-observables:1.3.0'
Expand All @@ -50,15 +50,15 @@ project.ext {

llzip = 'software.coley:lljzip:2.3.0'

logging_impl = 'ch.qos.logback:logback-classic:1.2.10' // newer releases break in jar releases
logging_impl = 'ch.qos.logback:logback-classic:1.4.11' // newer releases break in jar releases

mockito = 'org.mockito:mockito-core:4.9.0'
mockito = 'org.mockito:mockito-core:5.6.0'

openrewrite = 'org.openrewrite:rewrite-java-17:8.1.3'
openrewrite = 'org.openrewrite:rewrite-java-17:8.7.4'

procyon = "org.bitbucket.mstrobel:procyon-compilertools:0.6.0"

picocli = 'info.picocli:picocli:4.7.1'
picocli = 'info.picocli:picocli:4.7.5'

regex = 'com.github.tommyettinger:regexodus:0.1.15'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ public DelegatingJavaParser(@Nonnull JavaParser delegate) {
this.delegate = delegate;
}

@Nonnull
@Override
public SourceFile requirePrintEqualsInput(@Nonnull SourceFile sourceFile, @Nonnull Input input, @Nullable Path relativeTo, @Nonnull ExecutionContext ctx) {
// Do not do any idempotent source file checks
return sourceFile;
}

@Nonnull
@Override
public Stream<SourceFile> parseInputs(@Nonnull Iterable<Input> sources,
Expand All @@ -41,6 +48,10 @@ public Stream<SourceFile> parseInputs(@Nonnull Iterable<Input> sources,
// The default source-set type generation logic is not well optimized.
// We also do not gain significant benefits from it, so we can skip it entirely.
ctx.putMessage(SKIP_SOURCE_SET_TYPE_GENERATION, true);

// Do not do any idempotent source file checks
ctx.putMessage(ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT, false);

return delegate.parseInputs(sources, relativeTo, ctx);
} catch (Throwable t) {
logger.error("Error while parsing source into AST", t);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
import org.fxmisc.richtext.model.PlainTextChange;
import org.fxmisc.richtext.model.TwoDimensional;
import org.kordamp.ikonli.carbonicons.CarbonIcons;
import org.openrewrite.ParseError;
import org.openrewrite.ParseExceptionResult;
import org.openrewrite.SourceFile;
import org.openrewrite.Tree;
import org.openrewrite.java.JavaParser;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaType;
import org.openrewrite.marker.Range;
import org.openrewrite.tree.ParseError;
import software.coley.recaf.analytics.logging.DebuggingLogger;
import software.coley.recaf.analytics.logging.Logging;
import software.coley.recaf.info.AndroidClassInfo;
Expand Down

0 comments on commit 1260283

Please sign in to comment.