Add debug logging

evantill · Jul 26, 2017 · 990a2ef · 990a2ef
1 parent 7f8bb82
commit 990a2ef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/kotlin/nebula/plugin/compile/JavaCrossCompilePlugin.kt b/src/main/kotlin/nebula/plugin/compile/JavaCrossCompilePlugin.kt
@@ -10,13 +10,16 @@ import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.compile.GroovyCompile
 import org.gradle.api.tasks.compile.JavaCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.File
 
 class JavaCrossCompilePlugin : Plugin<Project> {
     companion object {
         const val RT_JAR_PATH = "jre/lib/rt.jar"
         const val CLASSES_JAR_PATH = "../Classes/classes.jar"
 
+        val logger: Logger = LoggerFactory.getLogger(JavaCrossCompilePlugin::class.java)
         val providers = listOf(EnvironmentJDKPathProvider(), DefaultLocationJDKPathProvider())
     }
 
@@ -51,6 +54,7 @@ class JavaCrossCompilePlugin : Plugin<Project> {
         val jdkHome = providers
                 .map { it.provide(this) }
                 .firstOrNull() ?: throw cannotLocate()
+        logger.debug("Found JDK for $this at $jdkHome")
         val runtimeJars = listOf(
                 File(jdkHome, RT_JAR_PATH),
                 File(jdkHome, CLASSES_JAR_PATH)

diff --git a/src/main/kotlin/nebula/plugin/compile/provider/DefaultLocationJDKPathProvider.kt b/src/main/kotlin/nebula/plugin/compile/provider/DefaultLocationJDKPathProvider.kt
@@ -1,6 +1,8 @@
 package nebula.plugin.compile.provider
 
 import org.gradle.api.JavaVersion
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileFilter
 
@@ -9,6 +11,7 @@ import java.io.FileFilter
  */
 class DefaultLocationJDKPathProvider : JDKPathProvider {
     companion object {
+        val logger: Logger = LoggerFactory.getLogger(DefaultLocationJDKPathProvider::class.java)
         val basePaths = listOf(
                 File("/usr/lib/jvm"),
                 File("/Library/Java/JavaVirtualMachines"),
@@ -22,14 +25,17 @@ class DefaultLocationJDKPathProvider : JDKPathProvider {
         }.reversed()
 
         if (candidates.isEmpty()) {
+            logger.debug("No candidates were found in search locations $basePaths")
             return null
         }
 
         listOf("oracle", "openjdk").forEach { variant ->
             val jdkHome = candidates.firstOrNull {
+                logger.debug("No candidates were found in search locations $basePaths")
                 it.name.startsWith("java-${javaVersion.majorVersion}-$variant")
             }
             if (jdkHome != null) {
+                logger.debug("Found Ubuntu JDK at $jdkHome")
                 return jdkHome.absolutePath
             }
         }
@@ -42,10 +48,15 @@ class DefaultLocationJDKPathProvider : JDKPathProvider {
         if (jdkHome != null) {
             val macOsJdkHome = File(jdkHome, "Contents/Home")
             if (macOsJdkHome.exists()) {
+                logger.debug("Found macOS JDK at $jdkHome")
                 return macOsJdkHome.absolutePath
             }
         }
 
-        return jdkHome?.absolutePath
+        if (jdkHome == null) {
+            logger.debug("No JDKs found in candidate locations $candidates ")
+            return null
+        }
+        return jdkHome.absolutePath
     }
 }