diff --git a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar index 5c2d1cf016..7454180f2a 100644 Binary files a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar and b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.jar differ diff --git a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties index f04d6a20ae..05679dc3c1 100644 --- a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties +++ b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew index 83f2acfdc3..744e882ed5 100755 --- a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew +++ b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat index 24467a141f..ac1b06f938 100644 --- a/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat +++ b/org.eclipse.xtext.xtext.wizard/resources/gradlew/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend index 22e675f27c..4e6da65b3f 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/GradleBuildFile.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -25,7 +25,7 @@ class GradleBuildFile extends TextFile { �IF !allDependencies.isEmpty� dependencies { �FOR p : project.upstreamProjects� - compile project(':�p.name�') + api project(':�p.name�') �ENDFOR� �FOR dep : mavenDependencies� �IF dep.version !== null� diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend index 43cb744309..733fb45e02 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend @@ -319,7 +319,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { pluginsSection = ''' �IF config.languageServer === LanguageServer.FATJAR� plugins { - id 'com.github.johnrengelman.shadow' version '5.2.0' + id 'com.github.johnrengelman.shadow' version '7.0.0' } �ENDIF� @@ -336,7 +336,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { �IF config.languageServer === LanguageServer.FATJAR� shadowJar { from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output) - configurations = [project.configurations.runtime] + configurations = [project.configurations.runtimeClasspath] exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA','schema/*', '.options', '.api_description', '*.profile', '*.html', 'about.*', 'about_files/*', 'plugin.xml', 'systembundle.properties', 'profile.list') diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend index b5aa80035a..6d527c1b09 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend @@ -104,9 +104,9 @@ class ParentProjectDescriptor extends ProjectDescriptor { �ENDIF� } - apply plugin: 'java' + apply plugin: 'java-library' dependencies { - compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}") + api platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}") } apply plugin: 'org.xtext.xtend' diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index a57fa82364..489a44cb43 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2017 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -285,7 +285,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { additionalContent = ''' configurations { mwe2 { - extendsFrom compile + extendsFrom api } } @@ -297,7 +297,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { } task generateXtextLanguage(type: JavaExec) { - main = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher' + mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher' classpath = configurations.mwe2 inputs.file "�Outlet.MAIN_JAVA.sourceFolder�/�workflowFilePath�" inputs.file "�Outlet.MAIN_JAVA.sourceFolder�/�grammarFilePath�" @@ -310,6 +310,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { �IF testProject.inlined� �testProject.buildGradle.additionalContent� �ENDIF� + processResources.dependsOn(generateXtextLanguage) generateXtext.dependsOn(generateXtextLanguage) clean.dependsOn(cleanGenerateXtextLanguage) eclipse.classpath.plusConfigurations += [configurations.mwe2] diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java index 9794b0b24d..97afa3ab1d 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/Scope.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2018 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -9,9 +9,9 @@ package org.eclipse.xtext.xtext.wizard; public enum Scope { - COMPILE("compile", "compile"), - TESTCOMPILE("test", "testCompile"), - TESTRUNTIME("test", "testRuntime"), + COMPILE("compile", "api"), + TESTCOMPILE("test", "testImplementation"), + TESTRUNTIME("test", "testRuntimeOnly"), PROVIDED("provided", "providedCompile"); private String mavenNotation; diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend index 77a17ed4da..f55ed25905 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -69,7 +69,7 @@ class WebProjectDescriptor extends ProjectDescriptor { task jettyRun(type:JavaExec) { dependsOn(sourceSets.main.runtimeClasspath) classpath = sourceSets.main.runtimeClasspath.filter{it.exists()} - main = '�config.language.basePackage�.web.ServerLauncher' + mainClass = '�config.language.basePackage�.web.ServerLauncher' standardInput = System.in group = 'run' description = 'Starts an example Jetty server with your language' diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/GradleBuildFile.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/GradleBuildFile.java index d1f50fb356..7b0935d58d 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/GradleBuildFile.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/GradleBuildFile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -43,7 +43,7 @@ public String getContent() { Set _upstreamProjects = this.getProject().getUpstreamProjects(); for(final ProjectDescriptor p : _upstreamProjects) { _builder.append("\t"); - _builder.append("compile project(\':"); + _builder.append("api project(\':"); String _name = p.getName(); _builder.append(_name, "\t"); _builder.append("\')"); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java index 76625d553e..69b3f8b1de 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java @@ -1121,7 +1121,7 @@ public GradleBuildFile buildGradle() { _builder.append("plugins {"); _builder.newLine(); _builder.append("\t"); - _builder.append("id \'com.github.johnrengelman.shadow\' version \'5.2.0\'"); + _builder.append("id \'com.github.johnrengelman.shadow\' version \'7.0.0\'"); _builder.newLine(); _builder.append("}"); _builder.newLine(); @@ -1158,7 +1158,7 @@ public GradleBuildFile buildGradle() { _builder_1.append("from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output)"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("configurations = [project.configurations.runtime]"); + _builder_1.append("configurations = [project.configurations.runtimeClasspath]"); _builder_1.newLine(); _builder_1.append("\t"); _builder_1.append("exclude(\'META-INF/INDEX.LIST\', \'META-INF/*.SF\', \'META-INF/*.DSA\', \'META-INF/*.RSA\',\'schema/*\',"); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java index 234e8bed75..0bd05f77cd 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java @@ -187,13 +187,13 @@ public GradleBuildFile buildGradle() { _builder.append("\t"); _builder.newLine(); _builder.append("\t"); - _builder.append("apply plugin: \'java\'"); + _builder.append("apply plugin: \'java-library\'"); _builder.newLine(); _builder.append("\t"); _builder.append("dependencies {"); _builder.newLine(); _builder.append("\t\t"); - _builder.append("compile platform(\"org.eclipse.xtext:xtext-dev-bom:${xtextVersion}\")"); + _builder.append("api platform(\"org.eclipse.xtext:xtext-dev-bom:${xtextVersion}\")"); _builder.newLine(); _builder.append("\t"); _builder.append("}"); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index faaee0d679..882daba5e0 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2017 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -585,7 +585,7 @@ public GradleBuildFile buildGradle() { _builder.append("mwe2 {"); _builder.newLine(); _builder.append("\t\t"); - _builder.append("extendsFrom compile"); + _builder.append("extendsFrom api"); _builder.newLine(); _builder.append("\t"); _builder.append("}"); @@ -613,7 +613,7 @@ public GradleBuildFile buildGradle() { _builder.append("task generateXtextLanguage(type: JavaExec) {"); _builder.newLine(); _builder.append("\t"); - _builder.append("main = \'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher\'"); + _builder.append("mainClass = \'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher\'"); _builder.newLine(); _builder.append("\t"); _builder.append("classpath = configurations.mwe2"); @@ -668,6 +668,8 @@ public GradleBuildFile buildGradle() { _builder.newLineIfNotEmpty(); } } + _builder.append("processResources.dependsOn(generateXtextLanguage)"); + _builder.newLine(); _builder.append("generateXtext.dependsOn(generateXtextLanguage)"); _builder.newLine(); _builder.append("clean.dependsOn(cleanGenerateXtextLanguage)"); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java index dd19339674..e352f8ed6b 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2020 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -115,7 +115,7 @@ public GradleBuildFile buildGradle() { _builder_1.append("classpath = sourceSets.main.runtimeClasspath.filter{it.exists()}"); _builder_1.newLine(); _builder_1.append("\t"); - _builder_1.append("main = \'"); + _builder_1.append("mainClass = \'"); String _basePackage = this.getConfig().getLanguage().getBasePackage(); _builder_1.append(_basePackage, "\t"); _builder_1.append(".web.ServerLauncher\'");