Using viarta gradle plugin to sidestep conflict of multiple versions …

…of the UML EPackage in the editor.

GH-12

com.incquerylabs.magicdraw.benchmark/.gitignore

@@ -2,3 +2,4 @@
 /target/
 /build/
 /.gradle/
+/src/generated/vql

com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs

@@ -1,5 +1,5 @@
 BuilderConfiguration.is_project_specific=true
-autobuilding=true
+autobuilding=false
 eclipse.preferences.version=1
 generateEclipseExtensions=false
 generateGeneratedAnnotation=false
@@ -9,6 +9,7 @@ generateMatchers=NESTED_CLASS
 generateSuppressWarnings=true
 generatedAnnotationComment=
 includeDateInGenerated=false
+org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.useProjectSettings=true
 outlet.DEFAULT_OUTPUT.cleanDirectory=false
 outlet.DEFAULT_OUTPUT.cleanupDerived=false
 outlet.DEFAULT_OUTPUT.createDirectory=true
@@ -27,4 +28,3 @@ outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
 outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
 targetJavaVersion=JAVA5
 useJavaCompilerCompliance=true
-

com.incquerylabs.magicdraw.benchmark/build.gradle

@@ -5,6 +5,7 @@ import java.util.zip.ZipFile
 
 plugins {
   id "org.xtext.xtend" version  "2.0.2"
+  id "viatra-gradle-plugin" version "2.5.0-SNAPSHOT" 
 }
 
 xtext.version = xtextVersion
@@ -29,6 +30,12 @@ String[] classpathLibraries = [
 
 // Apply the java-library plugin to add support for Java Library
 
+vql {
+	packageClassNames('com.nomagic.uml2.ext.magicdraw.metadata.UMLPackage')
+	inputDirectory.set(file('src/main/java'))
+    outputDirectory.set(file('src/generated/vql'))
+}
+
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'java'

com.incquerylabs.magicdraw.benchmark/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip

com.incquerylabs.magicdraw.benchmark/gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

com.incquerylabs.magicdraw.benchmark/gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

com.incquerylabs.magicdraw.benchmark/settings.gradle

@@ -1,18 +1,19 @@
-/*
- * This settings file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/4.3/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
+pluginManagement {
+    repositories {
+		gradlePluginPortal()
+		mavenCentral()
+		maven {
+			url("https://repo.eclipse.org/content/groups/viatra/")
+		}
+        maven {
+	    	url "https://build.incquerylabs.com/nexus/repository/gradle-plugins"
+	    	credentials {
+		    	username = "$nexusUsername"
+		    	password = "$nexusPassword"
+			}
+		}
+		mavenLocal()
+    }
+}
 
 rootProject.name = 'com.incquerylabs.magicdraw.benchmark'