make Gradle property version argument parsing friendly to lists

Author: RBusarow

build-logic/core/src/main/kotlin/modulecheck/builds/BaseYamlMatrixTask.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2024 Rick Busarow
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -40,11 +40,11 @@ abstract class BaseYamlMatrixTask @Inject constructor(
 
   @get:Input abstract val startTagProperty: Property<String>
   private val startTag: String
-    get() = startTagProperty.getFinal()
+    get() = startTagProperty.get()
 
   @get:Input abstract val endTagProperty: Property<String>
   private val endTag: String
-    get() = endTagProperty.getFinal()
+    get() = endTagProperty.get()
 
   @get:Internal
   protected val matrixSectionRegex by lazy(NONE) {

build-logic/core/src/main/kotlin/modulecheck/builds/properties.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2024 Rick Busarow
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,87 +15,10 @@
 
 package modulecheck.builds
 
-import org.gradle.api.Project
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-inline fun <reified T : Any> ObjectFactory.property(
-  initialValue: T,
-  crossinline onSet: (T) -> Unit
-): ReadWriteProperty<Any, T> = object : ReadWriteProperty<Any, T> {
-
-  val delegate = property(T::class.java).convention(initialValue)
-
-  override fun getValue(thisRef: Any, property: KProperty<*>): T {
-    // return delegate.get()
-    return delegate.getFinal()
-  }
-
-  override fun setValue(thisRef: Any, property: KProperty<*>, value: T) {
-    // delegate.set(value)
-    delegate.setFinal(value)
-    onSet(value)
-  }
-}
-
-inline fun <reified T> ObjectFactory.optionalProperty(
-  crossinline onSet: (T) -> Unit
-): ReadWriteProperty<Any, T?> = object : ReadWriteProperty<Any, T?> {
-
-  val delegate = property(T::class.java)
-
-  override fun getValue(thisRef: Any, property: KProperty<*>): T? {
-    return delegate.orNull
-    // return delegate.getFinal()
-  }
-
-  override fun setValue(thisRef: Any, property: KProperty<*>, value: T?) {
-    // delegate.set(value)
-    delegate.setFinal(value)
-    if (value != null) {
-      onSet(value)
-    }
-  }
-}
-
-fun <T> Property<T>.getOrNullFinal(): T? {
-  finalizeValueOnRead()
-  disallowChanges()
-  return orNull
-}
 
 fun <T> Property<T>.getFinal(): T {
   finalizeValueOnRead()
   disallowChanges()
   return get()
 }
-
-@PublishedApi
-internal fun <T> Property<T>.setFinal(value: T) {
-  set(value)
-  disallowUnsafeRead()
-  disallowChanges()
-}
-
-fun <T> Project.propertyNamed(name: String): T {
-  return requireNotNull(findPropertyNamed(name))
-}
-
-fun <T> Project.findPropertyNamed(name: String): T? {
-  @Suppress("UNCHECKED_CAST")
-  return findProperty(name) as? T
-}
-
-fun <T> Project.gradlePropertyAsProvider(name: String): Provider<T?> {
-  return provider { findPropertyNamed(name) }
-}
-
-inline fun <T, R> Project.gradlePropertyAsProvider(
-  name: String,
-  crossinline transform: (T?) -> R
-): Provider<R?> {
-  return provider { transform(findPropertyNamed(name)) }
-}

build-logic/versions-matrix/src/main/kotlin/modulecheck/builds/matrix/VersionsMatrixExtension.kt

@@ -21,7 +21,6 @@ import com.rickbusarow.kgx.listProperty
 import com.rickbusarow.kgx.pluginId
 import com.rickbusarow.kgx.propertyOrNull
 import com.rickbusarow.kgx.version
-import modulecheck.builds.gradlePropertyAsProvider
 import org.gradle.api.Project
 import org.gradle.api.provider.ListProperty
 import org.gradle.kotlin.dsl.buildConfigField
@@ -51,7 +50,9 @@ open class Versions @Inject constructor(
     propertyName: String,
     default: List<String>
   ): ListProperty<String> = convention(
-    target.gradlePropertyAsProvider<List<String>>(propertyName).orElse(default)
+    target.providers.gradleProperty(propertyName)
+      .map { it.split("""\s*,\s*""".toRegex()) }
+      .orElse(default)
   )
 }
 

modulecheck-internal-testing/src/main/kotlin/modulecheck/testing/BaseTest.kt

@@ -32,7 +32,7 @@ import java.io.File
 interface BaseTest :
   HasTestEnvironmentFactory<DefaultTestEnvironment.Factory>,
   TrimmedAsserts {
-  override val testEnvironmentFactory
+  override val testEnvironmentFactory: DefaultTestEnvironment.Factory
     get() = DefaultTestEnvironment.Factory()
 
   /** shorthand for executing a test in a hermetic TestEnvironment but without any kase parameters */