Added cleaning outdated output files created by Clojure compile task.

Author: pbzdyl

.gitignore

@@ -5,6 +5,7 @@
 /.idea/shelf
 /.idea/libraries
 /.idea/modules
+/.idea/atlassian-ide-plugin.xml
 
 out
 dist

build.gradle

@@ -32,11 +32,14 @@ buildscript {
 
 group 'com.cursive-ide'
 version '1.1.0'
+ext.pluginId = 'com.cursive-ide.clojure'
+ext.pluginImplementationClass = 'cursive.ClojurePlugin'
 
 apply plugin: 'kotlin'
 apply plugin: 'groovy'
 apply plugin: 'maven'
 apply plugin: 'com.gradle.plugin-publish'
+apply plugin: "java-gradle-plugin"
 
 project.afterEvaluate {
   // Ugh, see https://discuss.gradle.org/t/kotlin-groovy-and-java-compilation/14903/9
@@ -55,6 +58,18 @@ dependencies {
   compile gradleApi()
   compile localGroovy()
   compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  testCompile gradleTestKit()
+  testCompile "junit:junit:4.12"
+  testCompile 'net.wuerl.kotlin:assertj-core-kotlin:0.1.3'
+}
+
+gradlePlugin {
+  plugins {
+    clojurePlugin {
+      id = pluginId
+      implementationClass = pluginImplementationClass
+    }
+  }
 }
 
 pluginBundle {
@@ -65,7 +80,7 @@ pluginBundle {
 
   plugins {
     clojurePlugin {
-      id = 'com.cursive-ide.clojure'
+      id = pluginId
       displayName = 'Gradle Clojure plugin'
     }
   }

gradle/wrapper/gradle-wrapper.jar

@@ -1,90 +1,90 @@
-@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
-if "%@eval[2+2]" == "4" goto 4NT_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=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-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
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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

gradlew.bat

@@ -34,6 +34,7 @@ import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.api.tasks.incremental.IncrementalTaskInputs
+import org.gradle.api.tasks.incremental.InputFileDetails
 import org.gradle.process.JavaForkOptions
 import org.gradle.process.internal.DefaultJavaForkOptions
 import org.gradle.process.internal.ExecException
@@ -181,17 +182,19 @@ open class ClojureCompile @Inject constructor(val fileResolver: FileResolver) :
     return reflectionWarnings
   }
 
-  @TaskAction
-  fun compile(inputs: IncrementalTaskInputs) {
-    compile()
+  override fun compile() {
+    throw UnsupportedOperationException()
   }
 
-  override fun compile() {
+  @TaskAction
+  fun compile(inputs: IncrementalTaskInputs) {
     logger.info("Starting ClojureCompile task")
 
-    destinationDir.deleteRecursively()
     destinationDir.mkdirs()
 
+    inputs.outOfDate { removeOutputFilesDerivedFromInputFile(it, destinationDir) }
+    inputs.removed { removeOutputFilesDerivedFromInputFile(it, destinationDir) }
+
     if (copySourceToOutput ?: !aotCompile) {
       project.copy {
         it.from(getSource()).into(destinationDir)
@@ -269,6 +272,30 @@ open class ClojureCompile @Inject constructor(val fileResolver: FileResolver) :
     }
   }
 
+  private fun removeOutputFilesDerivedFromInputFile(inputFileDetails: InputFileDetails, destinationDir: File) {
+    val sourceAbsoluteFile = inputFileDetails.file
+    if (isClojureSource(sourceAbsoluteFile)) {
+      logger.debug("Removing class files for {}", inputFileDetails.file)
+      val sourceCanonicalFileName = sourceAbsoluteFile.canonicalPath
+      val sourceFileRoot = getSourceRootsFiles()
+          .find { sourceCanonicalFileName.startsWith(it.canonicalPath) }
+          ?: throw IllegalStateException("No source root found for source file ${sourceAbsoluteFile}")
+      val sourceRelativeFile = sourceAbsoluteFile.relativeTo(sourceFileRoot)
+      val sourceRelativeDirectory = sourceRelativeFile.parentFile
+      val sourceFileName = sourceAbsoluteFile.nameWithoutExtension
+      destinationDir.resolve(sourceRelativeDirectory)
+          .listFiles { file -> file.name.startsWith(sourceFileName) }
+          ?.forEach {
+            logger.debug("Deleting derived file {}", it)
+            it.delete()
+          }
+    }
+  }
+
+  private fun  isClojureSource(file: File): Boolean {
+    return getSourceRoots().any { file.canonicalPath.startsWith(it) }
+  }
+
   private fun executeScript(script: String, stdout: OutputStream, stderr: OutputStream) {
     val file = createTempFile("clojure-compiler", ".clj", temporaryDir)
     file.bufferedWriter().use { out ->
@@ -281,7 +308,7 @@ open class ClojureCompile @Inject constructor(val fileResolver: FileResolver) :
 
     // clojure.core/compile requires following on its classpath:
     // - libs (this.classpath)
-    // - compiled namespaces sources (getSourceRootsFiles)
+    // - namespaces sources to be compiled (getSourceRootsFiles)
     // - *compile-path* directory (this.destinationDir)
     exec.classpath = classpath + SimpleFileCollection(getSourceRootsFiles()) + SimpleFileCollection(destinationDir)
 
@@ -321,16 +348,15 @@ open class ClojureCompile @Inject constructor(val fileResolver: FileResolver) :
   }
 
   private fun getSourceRoots(): HashSet<String> {
-    val roots = source
-        .filter { it is SourceDirectorySet }
-        .flatMap { (it as SourceDirectorySet).srcDirs }
+    return getSourceRootsFiles()
         .map { it.canonicalPath }
         .toHashSet()
-    return roots
   }
 
   private fun getSourceRootsFiles(): List<File> {
-    return getSourceRoots().map(::File)
+    return source
+        .filter { it is SourceDirectorySet }
+        .flatMap { (it as SourceDirectorySet).srcDirs }
   }
 
   companion object {

src/main/kotlin/cursive/ClojurePlugin.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Colin Fleming
+ *
+ * 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
+ *
+ * http://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.
+ */
+
+plugins {
+    id 'com.cursive-ide.clojure'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'org.clojure:clojure:1.8.0'
+}

src/main/resources/META-INF/gradle-plugins/com.cursive-ide.clojure.properties

@@ -0,0 +1,21 @@
+;
+; Copyright 2017 Colin Fleming
+;
+; 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
+;
+; http://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.
+;
+
+(ns basic-project.core)
+
+(defn hello [name]
+  (println "Generating message for" name)
+  (str "Hello " name))