unit test, bump dependencies, added more transpiler options support

Author: regrog

.classpath

@@ -12,8 +12,21 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/java">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<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-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>jsweet-gradle-plugin</name>
-	<comment></comment>
+	<comment>JSweet Gradle plugin</comment>
 	<projects>
 	</projects>
 	<buildSpec>

build.gradle

@@ -1,8 +1,7 @@
 buildscript {
 	dependencies {
 		classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
-		classpath 'junit:junit:4.12'
-		classpath "com.gradle.publish:plugin-publish-plugin:0.9.7"
+		classpath "com.gradle.publish:plugin-publish-plugin:0.12.0"
 	}
 	repositories {
 		maven { url "http://repository.jboss.org/nexus/content/groups/public/" }
@@ -15,13 +14,14 @@ buildscript {
 }
 
 plugins {
-    id 'java'
+    id 'java-gradle-plugin'
     id 'groovy'
     id 'maven'
     id 'maven-publish'
   	id "org.datlowe.maven-publish-auth" version "2.0.2"
-  	id "com.gradle.plugin-publish" version "0.11.0"
+  	id "com.gradle.plugin-publish" version "0.12.0"
     id 'signing'
+    id 'eclipse'
 }
 
 defaultTasks 'clean', 'check', 'assemble'
@@ -49,7 +49,22 @@ dependencies {
 	implementation localGroovy()
 
 	implementation group: 'org.jsweet', name: 'jsweet-transpiler', version: project.version
-	implementation group: 'org.codehaus.plexus', name: 'plexus-utils', version:'3.0.20'
+	implementation group: 'org.codehaus.plexus', name: 'plexus-utils', version:'3.3.0'
+
+	// test kit
+	testImplementation gradleTestKit()
+	
+	testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.0"
+	testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.0"
+	
+	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.0"
+	testRuntimeOnly  "org.junit.platform:junit-platform-launcher:1.7.0"
+		
+}
+
+test {
+	useJUnitPlatform()
+	testLogging.showStandardStreams = false
 }
 
 task sourceJar(type: Jar) { 
@@ -122,11 +137,60 @@ pluginBundle {
   vcsUrl = 'https://github.com/cincheo/jsweet'
   description = 'JSweet Gradle plugin'
   tags = ['jsweet', 'transpiler', 'java', 'web', 'typescript', 'typescript', 'gradle']
+}
+
+gradlePlugin {
+	// Define the plugin
+	plugins {
+	    jsweetPlugin {
+	      id = 'org.jsweet.jsweet-gradle-plugin'
+	      displayName = 'JSweet Gradle plugin'
+	      implementationClass = 'org.jsweet.gradle.JSweetPlugin'
+	    }
+	}
+}
+
+wrapper {
+	gradleVersion = "6.7.1"
+	distributionType = Wrapper.DistributionType.ALL
+}
 
-  plugins {
-    jsweetPlugin {
-      id = 'org.jsweet.jsweet-gradle-plugin'
-      displayName = 'JSweet Gradle plugin'
-    }
-  }
+// This block is neccessary to get Gradle's source code available when working on this project. This helps the development process tremendously.
+// See: http://stackoverflow.com/questions/22694199/gradle-api-sources-and-doc-when-writing-gradle-plugins/25305938#25305938
+import org.gradle.plugins.ide.eclipse.model.*
+eclipse {
+	classpath {
+		file {
+			whenMerged {Classpath cp ->
+				File gradleHome = gradle.getGradleHomeDir()
+				logger.warn "Using Gradle: ${gradleHome}"
+
+				AbstractLibrary gradleApiLibrary = cp.entries.find { it.path.contains 'gradle-api' }
+				if (gradleApiLibrary != null) {
+					File gradleSrc = new File(gradleHome, 'src')
+					if (!gradleSrc.exists()) {
+						// Eclipse launched gradle with the bin distribution, look for the all distribution.
+						File gradleAll = new File(gradle.getGradleHomeDir().getParentFile().getParentFile().absolutePath.replace('-bin', '-all'))
+						if (gradleAll.exists()) {
+							logger.debug "Found gradle-all: ${gradleAll}"
+							File gradleAllCurrent = gradleAll.listFiles().iterator().next()
+							if (gradleAllCurrent.exists()) {
+								logger.debug "Found gradle-all current: ${gradleAllCurrent}"
+								gradleSrc = new File(gradleAllCurrent, "gradle-${gradle.gradleVersion}/src")
+							}
+						}
+					}
+
+					if (gradleSrc.exists()) {
+						gradleApiLibrary.sourcePath = new org.gradle.plugins.ide.eclipse.model.internal.FileReferenceFactory().fromFile(gradleSrc)
+						logger.warn "Gradle's source found and included from: ${gradleSrc}"
+						logger.debug "Updated library entry: ${gradleApiLibrary}"
+					} else {
+						logger.warn "Gradle's source not included as it was not found at: ${gradleSrc}"
+						logger.warn "Update to the 'all' distribution with:\n> gradlew :wrapper --gradle-version=${gradle.gradleVersion} --distribution-type=all"
+					}
+				}
+			}
+		}
+	}
 }

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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/jsweet/gradle/AbstractJSweetTask.java

@@ -19,6 +19,7 @@
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.gradle.api.internal.ConventionTask;
+import org.gradle.api.tasks.Input;
 
 /**
  * Base class for JSweet tasks
@@ -30,8 +31,9 @@ public abstract class AbstractJSweetTask extends ConventionTask {
 
 	protected final Logger logger = Logger.getLogger(getClass());
 
+	@Input
 	protected JSweetPluginExtension configuration;
-	
+
 	public JSweetPluginExtension getConfiguration() {
 		return configuration;
 	}
@@ -41,8 +43,8 @@ public void setConfiguration(JSweetPluginExtension configuration) {
 	}
 
 	protected void logInfo(String content) {
-		if (configuration.isVerbose() != null && configuration.isVerbose() 
-				|| configuration.isVeryVerbose() != null && configuration.isVeryVerbose()) {
+		if (configuration.isVerbose() != null && configuration.isVerbose() || configuration.isVeryVerbose() != null
+				&& configuration.isVeryVerbose()) {
 			logger.info(content);
 		}
 	}

src/main/java/org/jsweet/gradle/JSweetCleanTask.java

@@ -32,7 +32,7 @@ private void clean(File directory) {
 		logInfo("cleaning: " + directory);
 		FileUtils.deleteQuietly(directory);
 	}
-	
+
 	@TaskAction
 	protected void clean() {
 		configureLogging();
@@ -55,7 +55,7 @@ protected void clean() {
 		}
 
 		clean(new File(".jsweet"));
-		
+
 		logInfo("clean end");
 	}
 }

src/main/java/org/jsweet/gradle/JSweetPlugin.java

@@ -57,7 +57,7 @@ public void apply(final Project project) {
 		task.setConfiguration(extension);
 		task.setSources(mainSources.getAllJava());
 		task.setClasspath(mainSources.getCompileClasspath());
-		
+
 		JSweetCleanTask cleanTask = project.getTasks().create("jsweetClean", JSweetCleanTask.class);
 		cleanTask.setConfiguration(extension);
 	}

src/main/java/org/jsweet/gradle/JSweetPluginExtension.java

@@ -37,11 +37,11 @@ public void setTargetVersion(EcmaScriptComplianceLevel targetVersion) {
 	}
 
 	public ModuleKind getModule() {
-	    return module;
+		return module;
 	}
-	
+
 	public void setModule(ModuleKind module) {
-	    this.module = module;
+		this.module = module;
 	}
 
 	public ModuleResolution getModuleResolution() {
@@ -56,6 +56,11 @@ public File getOutDir() {
 		return outDir;
 	}
 
+	/**
+	 * 
+	 * @param outDir
+	 *            the directory where JavaScript files are written
+	 */
 	public void setOutDir(File outDir) {
 		this.outDir = outDir;
 	}
@@ -212,6 +217,22 @@ public void setIgnoreTypeScriptErrors(Boolean ignoreTypeScriptErrors) {
 		this.ignoreTypeScriptErrors = ignoreTypeScriptErrors;
 	}
 
+	public Boolean isIgnoreJavaFileNameError() {
+		return ignoreJavaFileNameError;
+	}
+
+	public void setIgnoreJavaFileNameError(Boolean ignoreJavaFileNameError) {
+		this.ignoreJavaFileNameError = ignoreJavaFileNameError;
+	}
+
+	public Boolean isTscWatchMode() {
+		return tscWatchMode;
+	}
+
+	public void setTscWatchMode(Boolean tscWatchMode) {
+		this.tscWatchMode = tscWatchMode;
+	}
+
 	public File getHeader() {
 		return header;
 	}
@@ -243,7 +264,7 @@ public Boolean isVeryVerbose() {
 	public void setVeryVerbose(Boolean veryVerbose) {
 		this.veryVerbose = veryVerbose;
 	}
-	
+
 	public File getWorkingDir() {
 		return workingDir;
 	}
@@ -287,7 +308,9 @@ public void setWorkingDir(File workingDir) {
 	protected File header;
 
 	protected File workingDir;
-	
+
 	private Boolean tsserver;
 	private Boolean veryVerbose;
+	private Boolean ignoreJavaFileNameError;
+	private Boolean tscWatchMode;
 }