feat: Avoid undeclared reading of properties and variables

Author: osipxd

src/main/kotlin/BukkitGradlePlugin.kt

@@ -49,7 +49,7 @@ public class BukkitGradlePlugin : Plugin<Project> {
             main.convention(name.map { "${project.group}.${StringUtils.toPascalCase(it)}" })
             version.convention(provider { project.version.toString() })
             apiVersion.convention(provider { StringUtils.parseApiVersion(bukkit.apiVersion) })
-            url.convention(provider { findProperty("url")?.toString() })
+            url.convention(provider { providers.gradleProperty("url").forUseAtConfigurationTime().orNull })
         }
     }
 

src/main/kotlin/server/DevServerPlugin.kt

@@ -43,7 +43,7 @@ public class DevServerPlugin : Plugin<Project> {
         bukkitGradleDir = File(project.buildDir, "bukkit-gradle")
         bukkitGradleDir.mkdirs()
 
-        val properties = ServerProperties(project.rootDir)
+        val properties = ServerProperties(project.rootDir, project.providers)
         val coreVersion = project.provider { serverConfiguration.version ?: bukkit.apiVersion }
         val serverDir = project.layout.dir(coreVersion.map { File(properties.devServerDir, it) })
         val buildToolsDir = project.provider { properties.buildToolsDir }

src/main/kotlin/server/ServerProperties.kt

@@ -1,11 +1,13 @@
 package ru.endlesscode.bukkitgradle.server
 
 import org.gradle.api.InvalidUserDataException
+import org.gradle.api.provider.Provider
+import org.gradle.api.provider.ProviderFactory
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.util.*
 
-internal class ServerProperties(projectPath: File) {
+internal class ServerProperties(projectPath: File, private val providers: ProviderFactory) {
 
     val devServerDir: File
         get() = getDir(DEV_SERVER_DIR)
@@ -42,7 +44,7 @@ internal class ServerProperties(projectPath: File) {
     }
 
     private fun setDefault(property: Property, defaultValue: String) {
-        if (System.getenv(property.envVariable) == null) {
+        if (!getEnvProvider(property.envVariable).isPresent) {
             properties.setProperty(property.name, defaultValue)
         }
     }
@@ -55,19 +57,23 @@ internal class ServerProperties(projectPath: File) {
 
     private fun get(property: Property): String {
         val localProp = properties.getProperty(property.name)
-        val globalEnv = System.getenv(property.envVariable)
-        if (localProp == null && globalEnv == null) {
-            logger.error(
-                """
+        val globalEnv = getEnvProvider(property.envVariable).orNull
+        return localProp ?: globalEnv ?: showError(property)
+    }
+
+    private fun getEnvProvider(name: String): Provider<String> {
+        return providers.environmentVariable(name).forUseAtConfigurationTime()
+    }
+
+    private fun showError(property: Property): Nothing {
+        logger.error(
+            """
                 ${property.description} not found. It can be fixed by two ways:
                 1.Define variable "${property.name}" in the $NAME file
                 2.Define ${property.envVariable} environment variable
                 """.trimIndent()
-            )
-            throw InvalidUserDataException()
-        }
-
-        return localProp ?: globalEnv
+        )
+        throw InvalidUserDataException()
     }
 
     private data class Property(val name: String, val envVariable: String, val description: String)

src/main/kotlin/server/task/CreateIdeaJarRunConfiguration.kt

@@ -7,6 +7,7 @@ import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
+import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
@@ -15,10 +16,13 @@ import org.gradle.kotlin.dsl.withGroovyBuilder
 import ru.endlesscode.bukkitgradle.TASKS_GROUP_BUKKIT
 import ru.endlesscode.bukkitgradle.server.util.Idea
 import java.io.File
+import javax.inject.Inject
 
 /** Builds and writes to file run configuration in IDEA .xml format. */
 @Suppress("LeakingThis")
-public abstract class CreateIdeaJarRunConfiguration : DefaultTask() {
+public abstract class CreateIdeaJarRunConfiguration @Inject constructor(
+    providers: ProviderFactory
+) : DefaultTask() {
 
     @get:Input
     public abstract val configurationName: Property<String>
@@ -50,7 +54,7 @@ public abstract class CreateIdeaJarRunConfiguration : DefaultTask() {
         vmParameters.convention(emptyList())
         programParameters.convention(emptyList())
 
-        onlyIf { Idea.isActive() }
+        onlyIf { Idea.isActive(providers) }
     }
 
     @TaskAction

src/main/kotlin/server/util/Idea.kt

@@ -1,10 +1,14 @@
 package ru.endlesscode.bukkitgradle.server.util
 
+import org.gradle.api.provider.ProviderFactory
+
 internal object Idea {
 
     private const val IDEA_ACTIVE: String = "idea.active"
 
-    fun isActive(): Boolean = System.getProperty(IDEA_ACTIVE) == "true"
+    fun isActive(providers: ProviderFactory): Boolean {
+        return providers.systemProperty(IDEA_ACTIVE).forUseAtConfigurationTime().orNull == "true"
+    }
 
     @JvmStatic
     fun fileNameSlug(name: String): String {