Skip to content

Commit 368ffa0

Browse files
committed
Upgrade ASM, fixes Java 13 in fork mode
Closes #154
1 parent e62c38b commit 368ffa0

File tree

12 files changed

+41
-29
lines changed

12 files changed

+41
-29
lines changed

.idea/encodings.xml

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_ow2_asm_asm_7_0.xml

-13
This file was deleted.

.idea/libraries/Maven__org_ow2_asm_asm_7_3_1.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__org_ow2_asm_asm_tree_7_0.xml .idea/libraries/Maven__org_ow2_asm_asm_tree_7_3_1.xml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@ Version History
245245

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

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

end-to-end-tests/end-to-end-tests.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
1515
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
1616
<orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.6" level="project" />
17-
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:7.0" level="project" />
18-
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
18+
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" />
1919
<orderEntry type="library" scope="TEST" name="Maven: org.apache.bcel:bcel:5.2" level="project" />
2020
<orderEntry type="library" scope="TEST" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
2121
<orderEntry type="module-library">

end-to-end-tests/src/test/java/net/orfjackal/retrolambda/test/LambdaTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2013-2017 Esko Luontola and other Retrolambda contributors
1+
// Copyright © 2013-2020 Esko Luontola and other Retrolambda contributors
22
// This software is released under the Apache License 2.0.
33
// The license text is at http://www.apache.org/licenses/LICENSE-2.0
44

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

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

262265
/**

parent/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
<dependency>
8787
<groupId>org.ow2.asm</groupId>
8888
<artifactId>asm</artifactId>
89-
<version>7.0</version>
89+
<version>7.3.1</version>
9090
</dependency>
9191

9292
<dependency>
9393
<groupId>org.ow2.asm</groupId>
9494
<artifactId>asm-tree</artifactId>
95-
<version>7.0</version>
95+
<version>7.3.1</version>
9696
</dependency>
9797

9898
<dependency>

project.iml

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">
7+
<excludeFolder url="file://$MODULE_DIR$/parent/target/classes" />
8+
<excludeFolder url="file://$MODULE_DIR$/parent/target/test-classes" />
79
<excludeFolder url="file://$MODULE_DIR$/target" />
810
</content>
911
<orderEntry type="inheritedJdk" />

retrolambda-maven-plugin/retrolambda-maven-plugin.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
1515
<orderEntry type="module" module-name="retrolambda" />
16-
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
17-
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
16+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
17+
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" />
1818
<orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3" level="project" />
1919
<orderEntry type="module" module-name="retrolambda-api" />
2020
<orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />

retrolambda/retrolambda.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<orderEntry type="inheritedJdk" />
1212
<orderEntry type="sourceFolder" forTests="false" />
1313
<orderEntry type="module" module-name="retrolambda-api" />
14-
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
15-
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
14+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:7.3.1" level="project" />
15+
<orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.3.1" level="project" />
1616
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
1717
<orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3" level="project" />
1818
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />

0 commit comments

Comments
 (0)