fix reading symbolic links

Author: makeevrserg

.gitignore

@@ -1,37 +1,5 @@
-*.iml
-.secret
-.secrets
-.gradle
-/build-logic/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-local.properties
-.DS_Store
-/build-logic/build
-/build-logic/plugins/build
-/build-logic/plugins/convention/build
-/build-logic/plugins/android/build
-/build-logic/plugins/minecraft/build
-/build
-/buildSrc/build
-/captures
-.externalNativeBuild
-.cxx
-build-logic/local.properties
-androidApp/build
-androidApp/libs
 .idea
-androidApp/private_key.pepk
-androidApp/google-services.json
-androidApp/keystore.jks
-desktop/build
-keys.propertiesd
-# Samples
-samples/android-app/build
-samples/android-library/build
-samples/kmm-compose/build
-samples/kmm-lib/build
+.kotlin
+.gradle
+**/build
+**/.kotlin

build-logic/build.gradle.kts

@@ -1,17 +1,43 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
+import java.nio.file.Files
+import java.util.Properties
+import kotlin.io.path.reader
 
 plugins {
     `kotlin-dsl`
     alias(libs.plugins.vaniktech) apply false
-    id("ru.astrainteractive.gradleplugin.detekt") version "1.11.0" apply true
+//    id("ru.astrainteractive.gradleplugin.detekt") version "1.11.4" apply true
 }
 
 val klibs = libs
 
+private fun requireFileProperty(key: String): Result<String> {
+    return runCatching {
+        val reader = project.file("gradle.properties").let { file ->
+            val path = file.toPath()
+            if (Files.isSymbolicLink(path)) {
+                Files.readSymbolicLink(path).reader()
+            } else {
+                file.reader()
+            }
+        }
+        val properties = Properties().apply { load(reader) }
+        properties[key]?.toString() ?: error("Could not find property $key")
+    }
+}
+
+private fun requireGradleProperty(key: String): Result<String> {
+    return runCatching {
+        rootProject.property(key)
+            ?.toString()
+            ?: error("Could not find property $key")
+    }
+}
+
 private fun requireProperty(key: String): String {
-    return rootProject.property(key)
-        ?.toString()
-        ?: error("Could not find property $key")
+    return requireGradleProperty(key)
+        .getOrNull()
+        ?: requireFileProperty(key).getOrThrow()
 }
 
 data class ProjectConfiguration(

build-logic/gradle.properties

@@ -0,0 +1 @@
+../gradle.properties

build-logic/gradle.properties

@@ -0,0 +1,41 @@
+package ru.astrainteractive.gradleplugin.property
+
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import java.io.File
+import java.nio.file.Files
+import java.util.Properties
+import kotlin.io.path.reader
+
+private fun File.takeIfIsLinkOrExist(): File? {
+    if (exists() || Files.isSymbolicLink(toPath())) return this
+    return null
+}
+
+internal fun Project.fileOrParentFile(name: String): File? {
+    val parentOrNull = parent
+    val projectFileOrNull = file(name).takeIfIsLinkOrExist()
+    return when {
+        projectFileOrNull != null -> projectFileOrNull
+        parentOrNull != null -> parentOrNull.fileOrParentFile(name)
+        else -> rootProject.file(name).takeIfIsLinkOrExist()
+    }
+}
+
+internal fun Project.requireFileOrParentFile(name: String): File {
+    return fileOrParentFile(name)
+        ?: throw GradleException("No local.properties file found")
+}
+
+internal fun Properties.fromFile(file: File): Properties {
+    val reader = file.let { file ->
+        val path = file.toPath()
+        if (Files.isSymbolicLink(path)) {
+            Files.readSymbolicLink(path).reader()
+        } else {
+            file.reader()
+        }
+    }
+    load(reader)
+    return this
+}

build-logic/plugins/convention/src/main/kotlin/ru/astrainteractive/gradleplugin/property/ProjectExt.kt

@@ -3,6 +3,9 @@ package ru.astrainteractive.gradleplugin.property.internal
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import ru.astrainteractive.gradleplugin.property.PropertyValue
+import ru.astrainteractive.gradleplugin.property.fileOrParentFile
+import ru.astrainteractive.gradleplugin.property.fromFile
+import java.util.Properties
 
 /**
  * This class will load property from gradle.properties project file
@@ -11,10 +14,33 @@ class ProjectPropertyValue(
     private val project: Project,
     override val key: String
 ) : PropertyValue {
+    private fun getGradleProperty(): Result<String> {
+        project.logger.warn("#getGradleProperty $key")
+        return runCatching {
+            project.property(key)
+                ?.toString()
+                ?: throw GradleException("Required property $key not defined!")
+        }
+    }
+
+    private fun getFileProperty(): Result<String> {
+        project.logger.warn("#getFileProperty $key")
+        return runCatching {
+            val file = project
+                .fileOrParentFile("gradle.properties")
+                ?: throw GradleException("No gradle.properties found in project")
+            Properties()
+                .fromFile(file)
+                .getProperty(key)
+                ?: throw GradleException("Required property $key not found in gradle.properties!")
+        }
+    }
+
     override fun getValue() = runCatching {
-        project.property(key)
-            ?.toString()
-            ?: throw GradleException("Required property $key not defined!")
+        getGradleProperty()
+            .onFailure { project.logger.warn("Couldn't find $key with gradle's project.property()") }
+            .getOrNull()
+            ?: getFileProperty().getOrThrow()
     }
 
     override fun isExist() = project.hasProperty(key)

build-logic/plugins/convention/src/main/kotlin/ru/astrainteractive/gradleplugin/property/internal/ProjectPropertyValue.kt

@@ -3,6 +3,8 @@ package ru.astrainteractive.gradleplugin.property.internal
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import ru.astrainteractive.gradleplugin.property.PropertyValue
+import ru.astrainteractive.gradleplugin.property.fromFile
+import ru.astrainteractive.gradleplugin.property.requireFileOrParentFile
 import java.io.File
 import java.util.Properties
 
@@ -14,16 +16,8 @@ class SecretPropertyValue(
     override val key: String
 ) : PropertyValue {
 
-    private fun Project.fileOrParentFile(name: String): File? {
-        val projectFile = file(name).takeIf(File::exists)
-        if (projectFile != null) return projectFile
-        return parent?.fileOrParentFile(name)
-    }
-
     private val localPropertiesFile: File
-        get() = project.fileOrParentFile("local.properties")
-            ?: project.rootProject.file("local.properties").takeIf(File::exists)
-            ?: throw GradleException("No local.properties file found")
+        get() = project.requireFileOrParentFile("local.properties")
 
     /**
      * System.getenv doesn't allow dots
@@ -36,11 +30,9 @@ class SecretPropertyValue(
         if (systemEnvProperty != null) return@runCatching systemEnvProperty
         project.logger.warn("System.enviroment $envKey is missing. Getting it from local.properties")
         // if not ci getting from local.properties
-        val properties = Properties().apply {
-            val secretPropsFile = localPropertiesFile
-            load(secretPropsFile.reader())
-        }
-        return@runCatching properties.getProperty(key)
+        return@runCatching Properties()
+            .fromFile(localPropertiesFile)
+            .getProperty(key)
             ?: throw GradleException("Required property $key not defined!")
     }
 

build-logic/plugins/convention/src/main/kotlin/ru/astrainteractive/gradleplugin/property/internal/SecretPropertyValue.kt

@@ -3,3 +3,9 @@ kotlin.code.style=official
 makeevrserg.java.source=8
 makeevrserg.java.target=11
 makeevrserg.java.ktarget=11
+# Config
+project.name=GradlePlugin
+project.description=GradlePlugin for my kotlin projects
+project.group=ru.astrainteractive.gradleplugin
+project.web=https://github.com/makeevrserg/gradle-plugin
+project.version.string=1.11.4