Merge branch 'develop'

.github/workflows/maven.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         java-version: '17'

.gitignore

@@ -1,3 +1,8 @@
 /.launch/
 /.gradle/
 /com.minres.coredsl.mwe/
+/*.core_desc
+/package-lock.json
+/package.json
+/build/
+/node_modules/

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.minres.coredsl.parent</name>
+	<name>CoreDSL</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1707073375452</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -2,7 +2,7 @@ arguments=
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=
+connection.project.dir=vscode-extension-self-contained
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=

build.gradle

@@ -2,13 +2,29 @@ buildscript {
 	repositories {
 		mavenCentral()
 		gradlePluginPortal()
+		maven {
+			url "https://plugins.gradle.org/m2/"
+		}
 	}
 	dependencies {
 		classpath 'org.xtext:xtext-gradle-plugin:4.0.0'
+		classpath 'com.github.node-gradle:gradle-node-plugin:3.3.0'
+		classpath 'net.researchgate:gradle-release:2.8.1'
 	}
 }
 
-subprojects {
+apply plugin: 'com.github.node-gradle.node'
+apply plugin: 'net.researchgate.release'
+node {
+	version = '16.13.2'
+	npmVersion = '8.3.0'
+	download = true
+}
+
+tasks.named("npmInstall").configure { enabled = false }
+
+// Configuration for Xtext projects
+configure(subprojects.findAll { it.name.startsWith('com.minres') }) {
 	ext.xtextVersion = '2.33.0'
 	repositories {
 		mavenCentral()
@@ -22,16 +38,116 @@ subprojects {
 	apply plugin: 'org.xtext.xtend'
 	apply from: "${rootDir}/gradle/source-layout.gradle"
 	apply plugin: 'eclipse'
-
+	
 	group = 'com.minres.coredsl'
-	version = '2.0.12-SNAPSHOT'
+	version = '2.0.12'
 
 	java {
 		sourceCompatibility = JavaVersion.VERSION_17
 		targetCompatibility = JavaVersion.VERSION_17
 	}
-
+	
 	configurations.all {
 		exclude group: 'asm'
 	}
+
+}
+
+task npmInstallVsce(type: NpmTask, dependsOn: npmSetup) {
+	ext.destPath = "$rootProject.projectDir/node_modules/vsce" 
+	outputs.dir(destPath)
+	group 'Node'
+	description 'Installs the NodeJS package "Visual Studio Code Extension Manager"'
+	args = [ 'install', 'vsce' ]
+}
+
+// Configuration for vscode projects
+configure(subprojects.findAll { it.name.startsWith('vscode') }) {
+
+	apply plugin: 'com.github.node-gradle.node'
+	node {
+	    version = '16.13.2'
+	    npmVersion = '8.3.0'
+	    download = true
+	}
+
+	version = '2.0.12'
+
+	def inputFiles = fileTree(
+		dir: projectDir, 
+		excludes: [ 'out/**', '.gitignore', '.gradle/**', 'build/**', '*.gradle' ]
+	)
+
+	npmInstall {
+		inputs.files(inputFiles)
+		outputs.dir('out')
+	}
+
+	task vscodeExtension(dependsOn: [npmInstall, npmInstallVsce], type: NodeTask) {
+		ext.destDir = new File(buildDir, 'vscode')
+		ext.archiveName = "coredsl-vscode-${project.version}.vsix"
+		ext.destPath = "$destDir/$archiveName"
+		inputs.with {
+			files inputFiles
+			dir npmInstallVsce.destPath
+		}
+		outputs.dir destDir
+		doFirst {
+			destDir.mkdirs()
+		}
+		script = file("$npmInstallVsce.destPath/vsce")
+		args = [ 'package', '--out', destPath ]
+		execOverrides {
+			workingDir = projectDir
+		}
+	}
+
+	task clean {
+		doLast {
+			delete vscodeExtension.destDir
+			delete 'out' // output of npmInstall - don't want to delete node_modules
+		}
+
+	}
+
+}
+
+plugins.withType(com.github.gradle.node.NodePlugin) {
+	node {
+		workDir = file("$rootProject.buildDir/nodejs")
+		nodeModulesDir = rootProject.projectDir
+	}
+}
+
+updateVersion {
+		doLast {
+			// custom code
+			def versionPattern = /\d+.\d+(.\d+)?/
+			def encoding = 'UTF-8'
+			def filesToUpdate = [
+				new File('vscode-extension', 'package.json'),
+				new File('vscode-extension-self-contained', 'package.json'),
+			]
+
+			// String replacements - isn't long enough to justify advanced code ;)
+			filesToUpdate.forEach { file ->
+
+				String text = file.getText(encoding)
+				text = text.replaceAll("\"version\": \"$versionPattern\",", "\"version\": \"$project.version\",")
+				file.setText(text, encoding)
+			}
+		}
+	}
+
+release {
+    tagTemplate = 'v${version}'
+	preTagCommitMessage = '[release] pre tag commit: '
+    tagCommitMessage = '[release] creating tag: '
+    newVersionCommitMessage = '[release] new version commit: '
+    failOnSnapshotDependencies = false
+}
+
+// Workaround for issue https://github.com/researchgate/gradle-release/issues/144
+task build {
+	dependsOn subprojects.findResults { it.tasks.findByName('build') }
 }

com.minres.coredsl.feature/feature.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature id="com.minres.coredsl.feature"
 	label="CoreDsl Feature "
-	version="2.0.12">
+	version="2.0.14">
 	<plugin
 			id="com.minres.coredsl"
 			download-size="0"

com.minres.coredsl.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.12</version>
+		<version>2.0.14</version>
 	</parent>
 	<artifactId>com.minres.coredsl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

com.minres.coredsl.ide/.classpath

@@ -23,6 +23,6 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.coredsl.ide/.project

@@ -43,4 +43,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1707073375461</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

com.minres.coredsl.ide/.settings/org.eclipse.buildship.core.prefs

@@ -3,6 +3,6 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.gradle.user.home=null
 connection.java.home=null
 connection.jvm.arguments=
-connection.project.dir=..
+connection.project.dir=../vscode-extension-self-contained
 eclipse.preferences.version=1
 project.path=\:com.minres.coredsl.ide

com.minres.coredsl.ide/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.ide
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.12
+Bundle-Version: 2.0.14
 Bundle-SymbolicName: com.minres.coredsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl,

com.minres.coredsl.ide/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.12</version>
+		<version>2.0.14</version>
 	</parent>
 	<artifactId>com.minres.coredsl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>

com.minres.coredsl.repository/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.12</version>
+		<version>2.0.14</version>
 	</parent>
 	<artifactId>com.minres.coredsl.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

com.minres.coredsl.target/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.12</version>
+		<version>2.0.14</version>
 	</parent>
 	<artifactId>com.minres.coredsl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

com.minres.coredsl.tests/.classpath

@@ -21,7 +21,11 @@
 			<attribute name="gradle_used_by_scope" value="test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.coredsl.tests/.project

@@ -6,7 +6,7 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -43,4 +43,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1707073375464</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

com.minres.coredsl.tests/.settings/org.eclipse.buildship.core.prefs

@@ -3,6 +3,6 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.gradle.user.home=null
 connection.java.home=null
 connection.jvm.arguments=
-connection.project.dir=..
+connection.project.dir=../vscode-extension-self-contained
 eclipse.preferences.version=1
 project.path=\:com.minres.coredsl.tests

com.minres.coredsl.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.tests
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.12
+Bundle-Version: 2.0.14
 Bundle-SymbolicName: com.minres.coredsl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl,

com.minres.coredsl.tests/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.12</version>
+		<version>2.0.14</version>
 	</parent>
 	<artifactId>com.minres.coredsl.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

com.minres.coredsl.ui.tests/.classpath

@@ -15,7 +15,11 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.coredsl.ui.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.ui.tests
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.12
+Bundle-Version: 2.0.14
 Bundle-SymbolicName: com.minres.coredsl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl.ui,

com.minres.coredsl.ui.tests/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.12</version>
+		<version>2.0.14</version>
 	</parent>
 	<artifactId>com.minres.coredsl.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>