work

Author: dconeybe

firebase-dataconnect/ci/build.gradle.kts

@@ -12,44 +12,56 @@ spotless {
 
 abstract class InstallFirebaseToolsTask : DefaultTask() {
 
-  @get:Input abstract val firebaseToolsVersion: Property<String>
+  @get:Input abstract val version: Property<String>
 
-  @get:OutputDirectory abstract val installDir: DirectoryProperty
+  @get:OutputDirectory abstract val destDir: DirectoryProperty
 
   @get:Inject abstract val execOperations: ExecOperations
 
   @TaskAction
   fun execute() {
-    val installDir: File = installDir.get().asFile
-    val firebaseToolsVersion: String = firebaseToolsVersion.get()
+    val destDir: File = destDir.get().asFile
+    val version: String = version.get()
 
-    logger.lifecycle("Creating directory: $installDir")
-    installDir.mkdirs()
-
-    val packageJsonFile = File(installDir, "package.json")
+    val packageJsonFile = File(destDir, "package.json")
     logger.lifecycle("Creating $packageJsonFile")
     packageJsonFile.writeText("{}")
 
     execOperations.exec {
-      workingDir = installDir
+      workingDir = destDir
       setCommandLine(
         "npm",
         "install",
         "--fund=false",
         "--audit=false",
         "--save",
         "--save-exact",
-        "firebase-tools@$firebaseToolsVersion",
+        "firebase-tools@$version",
       )
       logger.lifecycle("Running command in directory $workingDir: ${commandLine.joinToString(" ")}")
     }
   }
 }
 
-tasks.register<InstallFirebaseToolsTask>("installFirebaseTools") {
-  val projectDirectory = layout.projectDirectory
-  installDir.set(providers.gradleProperty("installDir").map { projectDirectory.dir(it) })
-  firebaseToolsVersion.set(providers.gradleProperty("firebaseToolsVersion"))
+val installFirebaseToolsTask = tasks.register<InstallFirebaseToolsTask>("installFirebaseTools") {
+  group = "Data Connect CI"
+  description = "Install the firebase-tools npm package"
+  destDir.set(layout.buildDirectory.dir("firebase-tools"))
+  version.set(providers.requiredGradleProperty("firebaseToolsVersion"))
 }
 
+fun ProviderFactory.requiredGradleProperty(propertyName: String) =
+  gradleProperty(propertyName)
+    .orElse(
+      providers.provider<Nothing> {
+        throw RequiredPropertyMissing(
+          "zzyzx=${project.property(propertyName)} Project property \"$propertyName\" was not set, " +
+            "but is required. " +
+            "Consider setting this project property by specifying " +
+            "-P$propertyName=<value> on the Gradle command line, " +
+            "or by setting the ORG_GRADLE_PROJECT_installFirebaseTools environment variable."
+        )
+      }
+    )
+
 class RequiredPropertyMissing(message: String) : Exception(message)

firebase-dataconnect/ci/gradle.properties

@@ -9,7 +9,7 @@ org.gradle.caching=true
 org.gradle.configuration-cache=true
 
 # Enables incubating configuration-on-demand, where Gradle will attempt to configure only necessary projects.
-org.gradle.configureondemand=true
+org.gradle.configureondemand=false
 
 # When set to quiet, warn, info, or debug, Gradle will use this log level. The values are not case-sensitive.
 # Use "info" since this script uses a lot of info logging for normal output.