diff --git a/.gitignore b/.gitignore index 298fcd4dec31b325457fc56c64c9198b045613cf..8b0a5d6ba7401c7202a4c0bd0e6c9262c3da10df 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 e4643020671434ce7e65da940497f30b3bae28a3..86019142d221dbb3177fb67621124e9d6ff07bb0 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 0c84fdae39e700deec0a56bba9a21c475fbe3ec1..f9ad6ee9e3b92b12a011b948ed939a7a95f39024 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 dda77eec7db58c7cae4106b95aadbac2f8a643e6..cf6e978fa333d645fe13b01f465c3fef31b9632b 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 0977da1bb8d1a94ebbc16a7e2ee4cfd4c5c218e6..e71bf084b58c3fbf0175b63820c5e7617074a387 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) {