Merge pull request #207 from itemis/cd_wa

[#185] adapt gradle examples to deal with platform range bug

greetings-gradle/2.12.0/build.gradle

@@ -1,9 +1,12 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		maven {
+    		url "https://plugins.gradle.org/m2/"
+    	}
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:1.0.15'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.12.0/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

greetings-gradle/2.12.0/gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

greetings-gradle/2.12.0/gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-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=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+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=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

greetings-gradle/2.12.0/org.xtext.example.mydsl/build.gradle

@@ -1,9 +1,25 @@
 dependencies {
 	testCompile "junit:junit:4.12"
-	testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}"
-	testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}"
-	compile "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}"
-	compile "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}"
+	testCompile("org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	testCompile("org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile("org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile("org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile("org.eclipse.platform:org.eclipse.core.runtime:3.19.0") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile "org.eclipse.platform:org.eclipse.equinox.common:3.13.0"
 }
 configurations {
 	mwe2 {
@@ -12,9 +28,18 @@ configurations {
 }
 
 dependencies {
-	mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059"
-	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
-	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+	mwe2("org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.0.201605261059") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	mwe2("org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	mwe2("org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
 	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
 }
 

greetings-gradle/2.14.0/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:1.0.20'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.14.0/org.xtext.example.mydsl/build.gradle

@@ -8,8 +8,18 @@ dependencies {
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
 		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
 	}
-	compile "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}"
-	compile "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}"
+	compile("org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile("org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile("org.eclipse.platform:org.eclipse.core.runtime:3.19.0") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	compile "org.eclipse.platform:org.eclipse.equinox.common:3.13.0"
 }
 configurations {
 	mwe2 {
@@ -18,9 +28,18 @@ configurations {
 }
 
 dependencies {
-	mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.1.201705291010"
-	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
-	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
+	mwe2("org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.9.1.201705291010") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	mwe2("org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
+	mwe2("org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}") {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
 	mwe2 "org.eclipse.xtext:xtext-antlr-generator:[2.1.1, 3)"
 }
 

greetings-gradle/2.17.0/org.xtext.example.mydsl.parent/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:2.0.4'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.18.0/org.xtext.example.mydsl.parent/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:2.0.4'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.19.0/org.xtext.example.mydsl.parent/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:2.0.7'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.20.0-J11/org.xtext.example.mydsl.parent/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:2.0.8'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.20.0/org.xtext.example.mydsl.parent/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:2.0.8'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }
 

greetings-gradle/2.21.0-J11/org.xtext.example.mydsl.parent/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		gradlePluginPortal()
 	}
 	dependencies {
-		classpath 'org.xtext:xtext-gradle-plugin:2.0.8'
+		classpath 'org.xtext:xtext-gradle-plugin:2.0.9'
 	}
 }