From 587749756971312118b8b2b679d64697c811c1d8 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 4 Oct 2023 18:26:05 +0200
Subject: [PATCH] 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.
---
.gitignore | 1 -
.gitlab-ci.yml | 2 +-
README.md | 3 ---
build.gradle | 25 -------------------
.../internal/core/parser/SubParsers.java | 2 +-
5 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/.gitignore b/.gitignore
index 298fcd4..8b0a5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
/bin/
/src/org/eventb/internal/core/typecheck/TypeUnifier.java
.gradle
-SubParsers.patch
build
local.*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e464302..8601914 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/README.md b/README.md
index 0c84fda..f9ad6ee 100644
--- a/README.md
+++ b/README.md
@@ -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!**
diff --git a/build.gradle b/build.gradle
index dda77ee..cf6e978 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
diff --git a/src/org/eventb/internal/core/parser/SubParsers.java b/src/org/eventb/internal/core/parser/SubParsers.java
index 0977da1..e71bf08 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<org.eventb.core.ast.BoundIdentDecl> {
+ public static class BoundIdentDeclSubParser extends ValuedNudParser<BoundIdentDecl> {
@Override
protected int getKind(AbstractGrammar grammar) {
--
GitLab