wip

Author: rli

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

@@ -3,11 +3,18 @@
 
 package software.aws.toolkits.gradle
 
-import org.eclipse.jgit.api.Git
 import org.gradle.api.JavaVersion
+import org.gradle.api.logging.Logging
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
+import org.gradle.api.provider.ValueSource
+import org.gradle.api.provider.ValueSourceParameters
+import org.gradle.process.ExecOperations
 import software.aws.toolkits.gradle.intellij.IdeVersions
+import java.io.ByteArrayOutputStream
+import java.io.OutputStream
+import java.nio.charset.Charset
+import javax.inject.Inject
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion as KotlinVersionEnum
 
 /**
@@ -42,21 +49,37 @@ fun<T : Any> Project.withCurrentProfileName(consumer: (String) -> T): Provider<T
     }
 }
 
-fun Project.buildMetadata() =
-    try {
-        val git = Git.open(rootDir)
-        val currentShortHash = git.repository.findRef("HEAD").objectId.abbreviate(7).name()
-        val isDirty = git.status().call().hasUncommittedChanges()
+abstract class GitHashValueSource : ValueSource<String, ValueSourceParameters.None> {
+    @get:Inject
+    abstract val execOperations: ExecOperations
 
-        buildString {
-            append(currentShortHash)
+    override fun obtain(): String {
+        return try {
+            val output = ByteArrayOutputStream()
+            execOperations.exec {
+                commandLine("git", "rev-parse", "--short", "HEAD")
+                standardOutput = output
+            }
+            val currentShortHash = String(output.toByteArray(), Charset.defaultCharset())
+
+            val isDirty = execOperations.exec {
+                commandLine("git", "status", "-s")
+                standardOutput = OutputStream.nullOutputStream()
+            }.exitValue != 0
 
-            if (isDirty) {
-                append(".modified")
+            buildString {
+                append(currentShortHash)
+
+                if (isDirty) {
+                    append(".modified")
+                }
             }
-        }
-    } catch(e: Exception) {
-        logger.warn("Could not determine current commit", e)
+        } catch(e: Exception) {
+            Logging.getLogger(GitHashValueSource::class.java).warn("Could not determine current commit", e)
 
-        "unknownCommit"
+            "unknownCommit"
+        }
     }
+}
+
+fun Project.buildMetadata() = providers.of(GitHashValueSource::class.java) {}

buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts

@@ -22,7 +22,7 @@ version = "$toolkitVersion.${ideProfile.shortName}"
 if (!project.isCi()) {
     val buildMetadata = buildMetadata()
     tasks.withType<PatchPluginXmlTask>().configureEach {
-        pluginVersion.set("${project.version}+$buildMetadata")
+        pluginVersion.set(buildMetadata.map { "${project.version}+$it" })
     }
 
     tasks.named<BuildPluginTask>("buildPlugin") {

gradle.properties

@@ -29,3 +29,6 @@ kotlin.build.report.output=file
 
 # don't bundle Kotlin stdlib with plugin
 kotlin.stdlib.default.dependency=false
+
+#org.gradle.configuration-cache=true
+#org.gradle.configuration-cache.problems=warn

plugins/amazonq/build.gradle.kts

@@ -21,16 +21,16 @@ buildscript {
     }
 }
 
-val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
-    includeUnreleased.set(true)
-    changeLogFile.value(layout.buildDirectory.file("changelog/change-notes.xml"))
-}
+//val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
+//    includeUnreleased.set(true)
+//    changeLogFile.value(layout.buildDirectory.file("changelog/change-notes.xml"))
+//}
 
 tasks.jar {
-    dependsOn(changelog)
-    from(changelog) {
-        into("META-INF")
-    }
+//    dependsOn(changelog)
+//    from(changelog) {
+//        into("META-INF")
+//    }
 }
 
 dependencies {
@@ -110,6 +110,8 @@ val downloadFlareArtifacts by tasks.registering(Download::class) {
 }
 
 val prepareBundledFlare by tasks.registering(Copy::class) {
+    // TODO: https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:requirements:use_project_during_execution
+    notCompatibleWithConfigurationCache("requires some untangling")
     dependsOn(downloadFlareArtifacts)
     inputs.files(downloadFlareArtifacts)
 

plugins/core/resources/build.gradle.kts

@@ -26,6 +26,8 @@ tasks.test {
 }
 
 val download = tasks.register<Download>("downloadResources") {
+    notCompatibleWithConfigurationCache("requires some untangling")
+
     dest("$buildDir/downloaded-resources/software/aws/toolkits/resources/")
     src(listOf("https://idetoolkits.amazonwebservices.com/endpoints.json"))
     onlyIfModified(true)

plugins/toolkit/jetbrains-core/build.gradle.kts

@@ -40,10 +40,10 @@ dependencies {
     }
 }
 
-val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
-    includeUnreleased.set(true)
-    changeLogFile.set(project.file("$buildDir/changelog/change-notes.xml"))
-}
+//val changelog = tasks.register<GeneratePluginChangeLog>("pluginChangeLog") {
+//    includeUnreleased.set(true)
+//    changeLogFile.set(project.file("$buildDir/changelog/change-notes.xml"))
+//}
 
 tasks.compileJava {
     // https://github.com/gradle/gradle/issues/26006
@@ -55,15 +55,15 @@ tasks.compileJava {
 PatchPluginXmlTask.register(project)
 val patchPluginXml = tasks.named<PatchPluginXmlTask>("patchPluginXml")
 patchPluginXml.configure {
-    val buildSuffix = if (!project.isCi()) "+${buildMetadata()}" else ""
-    pluginVersion.set("$toolkitVersion.${ideProfile.shortName}$buildSuffix")
+    val buildSuffix = buildMetadata().map { if (!project.isCi()) "+${it}" else "" }
+    pluginVersion.set(buildSuffix.map { "$toolkitVersion.${ideProfile.shortName}$it" })
 }
 
 tasks.jar {
-    dependsOn(patchPluginXml, changelog)
-    from(changelog) {
-        into("META-INF")
-    }
+//    dependsOn(patchPluginXml, changelog)
+//    from(changelog) {
+//        into("META-INF")
+//    }
 
     from(patchPluginXml) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -77,8 +77,8 @@ tasks.integrationTest {
 }
 
 val gatewayPluginXml = tasks.register<PatchPluginXmlTask>("pluginXmlForGateway") {
-    val buildSuffix = if (!project.isCi()) "+${buildMetadata()}" else ""
-    pluginVersion.set("GW-$toolkitVersion-${ideProfile.shortName}$buildSuffix")
+    val buildSuffix = buildMetadata().map { if (!project.isCi()) "+${it}" else "" }
+    pluginVersion.set(buildSuffix.map { "GW-$toolkitVersion-${ideProfile.shortName}$it" })
 }
 
 val patchGatewayPluginXml by tasks.registering {
@@ -113,7 +113,7 @@ val gatewayArtifacts by configurations.creating {
     extendsFrom(configurations["implementation"], configurations["runtimeOnly"])
 }
 
-val gatewayJar = tasks.create<Jar>("gatewayJar") {
+val gatewayJar = tasks.register<Jar>("gatewayJar") {
     // META-INF/plugin.xml is a duplicate?
     // unclear why the exclude() statement didn't work
     duplicatesStrategy = DuplicatesStrategy.WARN