Skip to content

Commit

Permalink
Java 11 support, #47
Browse files Browse the repository at this point in the history
  • Loading branch information
dodie committed Nov 30, 2018
1 parent e95ef25 commit 722d2ca
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/development-guide.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Required software for development

- *Java 1.8* to compile the core package, and *Java 1.9* to run the whole test suite
- *Java 8* to compile the core package, and *Java 11* to run the whole test suite
- *Maven 3.0.5*
- *Gradle 4.10.2*

Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ so you can worry much less about expressing assertions, and still have meaningfu
Supports [JUnit 4](https://github.com/dodie/scott/tree/master/scott-examples/junit4),
[JUnit 5](https://github.com/dodie/scott/tree/master/scott-examples/junit5),
and [Cucumber JVM](https://github.com/dodie/scott/tree/master/scott-examples/cucumber),
on Java 7, Java 8, and Java 9.
on Java 7, Java 8, and Java 11.


How to use
Expand Down
5 changes: 2 additions & 3 deletions scott-tests/junit5-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.8.0</version>
<configuration>
<source>1.9</source>
<target>1.9</target>
<release>11</release>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion scott-tests/junit5-tests/readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Scott Test Reporter - JUnit 5 Test Suite
========================================

Ensures that the features of JUnit 5 work well with Scott. This suite also tests Java 9 integration.
Ensures that the features of JUnit 5 work well with Scott. This suite also tests Java 11 integration.

4 changes: 2 additions & 2 deletions scott/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.0</version>
<version>7.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>6.0</version>
<version>7.0</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class ConstructorTransformerMethodVisitor extends MethodNode {
private MethodVisitor next;

public ConstructorTransformerMethodVisitor(MethodVisitor next, final int access, final String name, final String desc, final String signature, final String[] exceptions, String className) {
super(Opcodes.ASM5, access, name, desc, signature, exceptions);
super(Opcodes.ASM7, access, name, desc, signature, exceptions);
this.next = next;
this.className = className;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class ScopeExtractorTestMethodVisitor extends MethodNode {
private Map<Integer, Integer> lineNumerToFirstOccurrenceOfVariables;

public ScopeExtractorTestMethodVisitor(StateEmitterTestMethodVisitor next, final int access, final String name, final String desc, final String signature, final String[] exceptions) {
super(Opcodes.ASM5, access, name, desc, signature, exceptions);
super(Opcodes.ASM7, access, name, desc, signature, exceptions);
this.next = next;
lineNumerToFirstOccurrenceOfVariables = new HashMap<>();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class StateEmitterTestMethodVisitor extends MethodVisitor {


public StateEmitterTestMethodVisitor(MethodVisitor mv, String className, String methodName, boolean clearTrackedDataAtStart) {
super(Opcodes.ASM5, mv);
super(Opcodes.ASM7, mv);

Logger.log("Visiting: " + className + "." + methodName);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class StateTrackingTestClassVisitor extends ClassVisitor {
private TransformationParameters transformationParameters;

public StateTrackingTestClassVisitor(ClassVisitor cv, TransformationParameters transformationParameters) {
super(Opcodes.ASM5, cv);
super(Opcodes.ASM7, cv);
this.transformationParameters = transformationParameters;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class DiscoveryClassVisitor extends ClassVisitor {
private TransformationParameters.Builder transformationParameters;

public DiscoveryClassVisitor(TransformationParameters.Builder transformationParameters) {
super(Opcodes.ASM5);
super(Opcodes.ASM7);
this.transformationParameters = transformationParameters;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class TestDiscoveryMethodVisitor extends MethodVisitor {
private List<String> annotations = new ArrayList<>();

public TestDiscoveryMethodVisitor(MethodVisitor mv, TransformationParameters.Builder transformationParameters, String name, String desc, String signature) {
super(Opcodes.ASM5, mv);
super(Opcodes.ASM7, mv);
this.transformationParameters = transformationParameters;
this.methodName = name;
this.methodDesc = desc;
Expand Down

0 comments on commit 722d2ca

Please sign in to comment.