diff --git a/.gradle/config.properties b/.gradle/config.properties index af50a5c..30b6d34 100644 --- a/.gradle/config.properties +++ b/.gradle/config.properties @@ -1,2 +1,2 @@ -#Wed Jun 19 09:51:18 CEST 2024 -java.home=/Applications/Android Studio Preview.app/Contents/jbr/Contents/Home +#Mon Oct 28 13:03:52 CET 2024 +java.home=/Users/christian.wurthner/Library/Java/JavaVirtualMachines/jbr-17.0.9/Contents/Home diff --git a/gradle-bom/build.gradle.kts b/gradle-bom/build.gradle.kts index 4d03856..21672b7 100644 --- a/gradle-bom/build.gradle.kts +++ b/gradle-bom/build.gradle.kts @@ -25,7 +25,9 @@ val buildNumber = (project.findProperty("AzureBuildNumber") ?: "debug") group = "com.iodigital.gradlebom" version = "1.0.$buildNumber" -File(System.getenv("GITHUB_OUTPUT")).appendText("build_version=$version") +System.getenv("GITHUB_OUTPUT")?.takeUnless { it.isBlank() }?.let { path -> + File(path).appendText("build_version=$version") +} println("##vso[build.updatebuildnumber]name=${version},code=${buildNumber},buildId=${buildNumber}") @Suppress("UnstableApiUsage") diff --git a/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/GenericGenerateModuleBomTask.kt b/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/GenericGenerateModuleBomTask.kt index 2621aec..6dcc42d 100644 --- a/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/GenericGenerateModuleBomTask.kt +++ b/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/GenericGenerateModuleBomTask.kt @@ -8,13 +8,15 @@ abstract class GenericGenerateModuleBomTask : AbstractGenerateBomTask() { override fun getDescription() = "Creates a CycloneDX BOM" + private val projectPath = project.path + @Input @Option(option = "configuration", description = "The configuration to create a bom for. Run \"./gradlew dependencies\" to get a list.") abstract fun getConfiguration(): Property override fun createdNestedGradleCommand(): String { val configuration = getConfiguration().get() - val command = "${project.path.removeSuffix(":")}:dependencies" + val command = "${projectPath.removeSuffix(":")}:dependencies" return "./gradlew $command --configuration $configuration --no-daemon" } } \ No newline at end of file diff --git a/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/SpecificGenerateModuleBomTask.kt b/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/SpecificGenerateModuleBomTask.kt index eaf3d45..6f0c5bd 100644 --- a/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/SpecificGenerateModuleBomTask.kt +++ b/gradle-bom/src/main/java/com/iodigital/gradlebom/tasks/SpecificGenerateModuleBomTask.kt @@ -6,10 +6,12 @@ open class SpecificGenerateModuleBomTask @Inject constructor( private val configName: String, ) : AbstractGenerateBomTask() { + private val projectPath = project.path + override fun getDescription() = "Creates a CycloneDX BOM for configuration $configName" override fun createdNestedGradleCommand(): String { - val command = "${project.path.removeSuffix(":")}:dependencies" + val command = "${projectPath.removeSuffix(":")}:dependencies" return "./gradlew $command --configuration ${configName}RuntimeClasspath --no-daemon" } } \ No newline at end of file