Hotfix for props

wttech · Dec 1, 2021 · 2c3abe4 · 2c3abe4
1 parent 572f499
commit 2c3abe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/kotlin/com/cognifide/gradle/common/CommonPlugin.kt b/src/main/kotlin/com/cognifide/gradle/common/CommonPlugin.kt
@@ -44,7 +44,7 @@ class CommonPlugin : Plugin<Project> {
      */
     private fun checkPathEnabled(project: Project): Boolean {
         val envVars = listOf("JENKINS_HOME")
-        if (envVars.any { System.getenv(it).isNotBlank() }) {
+        if (envVars.any { (System.getenv(it) ?: "").isNotBlank() }) {
             return false
         }
 

diff --git a/src/main/kotlin/com/cognifide/gradle/common/build/PropertyParser.kt b/src/main/kotlin/com/cognifide/gradle/common/build/PropertyParser.kt
@@ -18,12 +18,12 @@ class PropertyParser(anyProject: Project) {
             return project.property(name).toString()
         }
 
-        val systemValue = System.getProperty(name)
+        val systemValue: String? = System.getProperty(name)
         if (systemValue != null) {
             return systemValue
         }
 
-        val envValue = System.getenv(name)
+        val envValue: String? = System.getenv(name)
         if (envValue != null) {
             return envValue
         }