Skip to content

Commit

Permalink
Upgrade ASM, fixes Java 13 in fork mode
Browse files Browse the repository at this point in the history
Closes #154
  • Loading branch information
luontola committed Jan 23, 2020
1 parent e62c38b commit 368ffa0
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 29 deletions.
6 changes: 5 additions & 1 deletion .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__org_ow2_asm_asm_7_0.xml

This file was deleted.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ Version History

- Improved error messages for Java 12 and newer, which have been confirmed
to not work without the Java agent
([Issue #154](https://github.com/luontola/retrolambda/issues/154))
- Upgraded the ASM library to improve compatibility with Java 13
([Issue #154](https://github.com/luontola/retrolambda/issues/154))

### Retrolambda 2.5.6 (2018-11-30)

Expand Down
4 changes: 2 additions & 2 deletions end-to-end-tests/end-to-end-tests.iml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.bcel:bcel:5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
<orderEntry type="module-library">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2013-2017 Esko Luontola and other Retrolambda contributors
// Copyright © 2013-2020 Esko Luontola and other Retrolambda contributors
// This software is released under the Apache License 2.0.
// The license text is at http://www.apache.org/licenses/LICENSE-2.0

Expand Down Expand Up @@ -255,8 +255,11 @@ public void enclosing_method_of_anonymous_class_inside_lambda_expression() throw
};
Class<?> anonymousClass = lambda.call().getClass();

// Before Java 13 the enclosing method is a bridge method
// whose name starts with "lambda$enclosing_method_of_anonymous_class_inside_lambda_expression$".
// Since Java 13 it's enclosed by the original method.
assertThat(anonymousClass.getEnclosingMethod().getName(),
startsWith("lambda$enclosing_method_of_anonymous_class_inside_lambda_expression$"));
containsString("enclosing_method_of_anonymous_class_inside_lambda_expression"));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>7.0</version>
<version>7.3.1</version>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>7.0</version>
<version>7.3.1</version>
</dependency>

<dependency>
Expand Down
2 changes: 2 additions & 0 deletions project.iml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/parent/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/parent/target/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
Expand Down
4 changes: 2 additions & 2 deletions retrolambda-maven-plugin/retrolambda-maven-plugin.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="retrolambda" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" />
<orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3" level="project" />
<orderEntry type="module" module-name="retrolambda-api" />
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
Expand Down
4 changes: 2 additions & 2 deletions retrolambda/retrolambda.iml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="retrolambda-api" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
<orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
Expand Down

0 comments on commit 368ffa0

Please sign in to comment.