Skip to content
Snippets Groups Projects
Commit 58774975 authored by dgelessus's avatar dgelessus
Browse files

Revert custom patch workaround for a Java 8 import handling bug

Java 11 and later have no problem with the original code, so we don't
need this patch anymore.
parent 38cd8582
Branches
Tags
No related merge requests found
Pipeline #121878 passed
/bin/
/src/org/eventb/internal/core/typecheck/TypeUnifier.java
.gradle
SubParsers.patch
build
local.*
......@@ -9,7 +9,7 @@ cache:
publish:
stage: deploy
image: eclipse-temurin:8
image: eclipse-temurin:17
script:
- openssl aes-256-cbc -pass "env:ENCRYPTION_PASSWORD" -d -a -md md5 -in gradle.properties.enc -out gradle.properties
- openssl aes-256-cbc -pass "env:ENCRYPTION_PASSWORD" -d -a -md md5 -in pubring.gpg.enc -out pubring.gpg
......
......@@ -14,6 +14,3 @@ No original file is changed, but we added:
* pubring.gpg.enc
* secring.gpg.enc
* settings.gradle
Note to future Jens:
After updating the sources the ```gradle patch``` task must be run. This modifies the sources. **Do not run the task multiple times!**
......@@ -49,31 +49,6 @@ public class ASTPlugin {
}
}
task patch() {
doLast {
def patch_content = """\
diff --git a/src/org/eventb/internal/core/parser/SubParsers.java b/src/org/eventb/internal/core/parser/SubParsers.java
index e71bf08..0977da1 100644
--- a/src/org/eventb/internal/core/parser/SubParsers.java
+++ b/src/org/eventb/internal/core/parser/SubParsers.java
@@ -492,7 +492,7 @@ public class SubParsers {
};
- public static class BoundIdentDeclSubParser extends ValuedNudParser<BoundIdentDecl> {
+ public static class BoundIdentDeclSubParser extends ValuedNudParser<org.eventb.core.ast.BoundIdentDecl> {
@Override
protected int getKind(AbstractGrammar grammar) {
"""
File p = file("SubParsers.patch")
p.delete()
p << patch_content
ant.patch(patchfile: 'SubParsers.patch', originalfile: 'src/org/eventb/internal/core/parser/SubParsers.java', failonerror: 'true')
}
}
java {
sourceCompatibility = JavaVersion.VERSION_1_7
......
......@@ -492,7 +492,7 @@ public class SubParsers {
};
public static class BoundIdentDeclSubParser extends ValuedNudParser<org.eventb.core.ast.BoundIdentDecl> {
public static class BoundIdentDeclSubParser extends ValuedNudParser<BoundIdentDecl> {
@Override
protected int getKind(AbstractGrammar grammar) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment