Changes to fix updated dependencies

7ccsmmdd · Jan 13, 2025 · 9c055b9 · 9c055b9
1 parent 1191120
commit 9c055b9
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 29 deletions.
diff --git a/.github/workflows/update-privaterepo-link.yml b/.github/workflows/update-privaterepo-link.yml
@@ -0,0 +1,19 @@
+name: Update privaterepo in README
+on: [create, workflow_dispatch]
+
+jobs:
+  update-readme:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Update link in README
+        run: sed -ri "s#(https://ep.mde-network.org/\?activities=)(.*)(&privaterepo=true)#\1https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/${GITHUB_REF_NAME}/activity.json\3#" README.md
+      - name: Commit changes to README
+        run: |
+          git config --global user.name 'update-privaterepo-link workflow'
+          git config --global user.email 'szschaler@users.noreply.github.com'
+          git add README.md
+          git commit -m "Automated update of privaterepo link"
+          git push
diff --git a/README.md b/README.md
@@ -7,4 +7,4 @@ Use this repository to explore the meta-model for the Turtles language as shown
 There are two ways to do this activity:
 
 1. You can check out the repository and import the projects into Eclipse, then do the activity there. Commit your changes and push them back to GitHub to trigger the autograding so you can see whether you've correctly implemented the grammar. More information about checking out and editing code in Eclipse can be found on KEATS.
-2. You can [do this activity in your browser](https://mdenet-ep.sites.er.kcl.ac.uk/?activities=https://raw.githubusercontent.com/6ccs3mde-7ccsmmdd-2023-24/turtles_explore_mm/master/activity.json&privaterepo=true). Click on the link and your browser will open the MDENet Education Platform with the activity pre-loaded. You can view visualisations of the meta-model, edit your grammar and test out the changes you have made by generating an editor. See the video on KEATS to find out how to do this. **Note that you must save your changes before switching to the generated editor or you will lose them.** Saving your changes will create a commit in your repository, which will also automatically trigger the autograding process.
+2. You can [do this activity in your browser](https://ep.mde-network.org/?activities=https://raw.githubusercontent.com/6ccs3mde-7ccsmmdd-2023-24/turtles_explore_mm/master/activity.json&privaterepo=true). Click on the link and your browser will open the MDENet Education Platform with the activity pre-loaded. You can view visualisations of the meta-model, edit your grammar and test out the changes you have made by generating an editor. See the video on KEATS to find out how to do this. **Note that you must save your changes before switching to the generated editor or you will lose them.** Saving your changes will create a commit in your repository, which will also automatically trigger the autograding process.
diff --git a/activity.json b/activity.json
@@ -5,7 +5,7 @@
             "title": "Edit your grammar",
             "icon": "xtext",
 
-            "tools": [ "https://mdenet-ep.sites.er.kcl.ac.uk/tools/xtext/xtext_tool.json" ],
+            "tools": [ "https://ep.mde-network.org/tools/xtext/xtext_tool.json" ],
 
             "panels": [
                 {
@@ -55,9 +55,9 @@
 
             "tools": [
                 "{{ID-panel-turtles}}/editor_tool.json", 
-                "https://mdenet-ep.sites.er.kcl.ac.uk/tools/emf/emf_tool.json",
-                "https://mdenet-ep.sites.er.kcl.ac.uk/tools/emfatic/emfatic_tool.json",
-                "https://mdenet-ep.sites.er.kcl.ac.uk/tools/epsilon/tools"
+                "https://ep.mde-network.org/tools/emf/emf_tool.json",
+                "https://ep.mde-network.org/tools/emfatic/emfatic_tool.json",
+                "https://ep.mde-network.org/tools/epsilon/tools"
             ],
 
             "panels": [

diff --git a/uk.ac.kcl.inf.mdd2.turtles.target/uk.ac.kcl.inf.mdd2.turtles.target.target b/uk.ac.kcl.inf.mdd2.turtles.target/uk.ac.kcl.inf.mdd2.turtles.target.target
@@ -8,36 +8,36 @@
 			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/releases/2023-09"/>
+			<repository location="https://download.eclipse.org/releases/2024-12"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.17.0/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
+			<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
 		<repository location="https://download.itemis.com/updates/releases/2.1.1/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
-			<unit id="org.junit" version="4.13.2.v20230809-1000"/>
-			<unit id="junit-jupiter-api" version="5.10.0"/>
-			<unit id="junit-jupiter-engine" version="5.10.0"/>
-			<unit id="junit-platform-commons" version="1.10.0"/>
-			<unit id="junit-platform-engine" version="1.10.0"/>
-			<unit id="junit-platform-launcher" version="1.10.0"/>
-			<unit id="junit-platform-runner" version="1.10.0"/>
-			<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
-			<unit id="org.opentest4j" version="1.3.0"/>
-			<unit id="org.objectweb.asm" version="9.5.0"/>
-			<unit id="org.objectweb.asm.tree" version="9.5.0"/>
-			<unit id="io.github.classgraph" version="4.8.149.v20220915-0556"/>
-			<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
-			<repository location="https://download.eclipse.org/releases/2023-09"/>
+			<unit id="com.google.gson" version="0.0.0"/>
+			<unit id="org.junit" version="0.0.0"/>
+			<unit id="junit-jupiter-api" version="0.0.0"/>
+			<unit id="junit-jupiter-engine" version="0.0.0"/>
+			<unit id="junit-platform-commons" version="0.0.0"/>
+			<unit id="junit-platform-engine" version="0.0.0"/>
+			<unit id="junit-platform-launcher" version="0.0.0"/>
+			<unit id="junit-platform-runner" version="0.0.0"/>
+			<unit id="org.hamcrest.core" version="0.0.0"/>
+			<unit id="org.opentest4j" version="0.0.0"/>
+			<unit id="org.objectweb.asm" version="0.0.0"/>
+			<unit id="org.objectweb.asm.tree" version="0.0.0"/>
+			<!-- <unit id="io.github.classgraph" version="0.0.0"/>
+			<unit id="org.aopalliance" version="0.0.0"/> -->
+			<repository location="https://download.eclipse.org/releases/2024-12"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://ci.eclipse.org/xpect/job/Xpect/job/master/lastSuccessfulBuild/artifact/org.eclipse.xpect.releng/p2-repository/target/repository/"/>

diff --git a/uk.ac.kcl.inf.mdd2.turtles.tests/META-INF/MANIFEST.MF b/uk.ac.kcl.inf.mdd2.turtles.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: uk.ac.kcl.inf.mdd2.turtles,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase.lib,
  uk.ac.kcl.inf.mdd2.turtles.ui;bundle-version="1.0.0",
- org.eclipse.xpect.xtext.lib;bundle-version="0.2.0",
+ org.eclipse.xpect.xtext.lib,
  org.eclipse.emf.ecore,
  junit-jupiter-api;bundle-version="5.9.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --git a/uk.ac.kcl.inf.mdd2.turtles/META-INF/MANIFEST.MF b/uk.ac.kcl.inf.mdd2.turtles/META-INF/MANIFEST.MF
@@ -10,12 +10,10 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase.lib,
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- io.github.classgraph;bundle-version="4.8.149",
- org.aopalliance;bundle-version="1.0.0"
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: uk.ac.kcl.inf.mdd2.parser.antlr,
  uk.ac.kcl.inf.mdd2.parser.antlr.internal,