wip

rli · rli · commit 69cb7b7c04e1 · 2025-08-13T16:59:40.000-07:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,13 +1,5 @@
 // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
-buildscript {
-    // This has to be here otherwise properties are not loaded and nothing works
-    val props = `java.util`.Properties()
-    file("${project.projectDir.parent}/gradle.properties").inputStream().use { props.load(it) }
-    props.entries.forEach { project.extensions.add(it.key.toString(), it.value) }
-}
-
 plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/CreateRelease.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/CreateRelease.kt
@@ -27,7 +27,7 @@ open class CreateRelease @Inject constructor(projectLayout: ProjectLayout) : Cha
 
     @Input
     @Optional
-    val issuesUrl: Provider<String?> = project.objects.property(String::class.java).convention("https://github.com/aws/aws-toolkit-jetbrains/issues")
+    val issuesUrl: Provider<String> = project.objects.property(String::class.java).convention("https://github.com/aws/aws-toolkit-jetbrains/issues")
 
     @OutputFile
     val releaseFile: RegularFileProperty = project.objects.fileProperty().convention(changesDirectory.file(releaseVersion.map { "$it.json" }))
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/GenerateChangeLog.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/GenerateChangeLog.kt
@@ -18,7 +18,7 @@ import software.aws.toolkits.gradle.changelog.JetBrainsWriter
 abstract class GenerateChangeLog(private val shouldStage: Boolean) : ChangeLogTask() {
     @Input
     @Optional
-    val repoUrl: Provider<String?> = project.objects.property(String::class.java).convention("https://github.com/aws/aws-toolkit-jetbrains")
+    val repoUrl: Provider<String> = project.objects.property(String::class.java).convention("https://github.com/aws/aws-toolkit-jetbrains")
 
     @Input
     val includeUnreleased: Property<Boolean> = project.objects.property(Boolean::class.java).convention(false)
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/NewChange.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/changelog/tasks/NewChange.kt
@@ -19,7 +19,7 @@ open class NewChange : ChangeLogTask() {
     @TaskAction
     fun create() {
         val changeType = if (project.hasProperty("changeType")) {
-            (project.property("changeType") as? String?)?.toUpperCase()?.let { ChangeType.valueOf(it) }
+            (project.property("changeType") as? String?)?.uppercase()?.let { ChangeType.valueOf(it) }
         } else defaultChangeType
         val description = if (project.hasProperty("description")) {
             project.property("description") as? String?
diff --git a/buildSrc/src/main/kotlin/toolkit-git-secrets.gradle.kts b/buildSrc/src/main/kotlin/toolkit-git-secrets.gradle.kts
@@ -8,41 +8,41 @@ plugins {
     id("de.undercouch.download")
 }
 
-val downloadGitSecrets = tasks.register<Download>("downloadGitSecrets") {
-    src("https://raw.githubusercontent.com/awslabs/git-secrets/master/git-secrets")
-    dest("$buildDir/git-secrets")
-    onlyIfModified(true)
-    useETag(true)
-}
-
-val gitSecrets = tasks.register<Exec>("gitSecrets") {
-    onlyIf {
-        !DefaultNativePlatform.getCurrentOperatingSystem().isWindows
-    }
-
-    dependsOn(downloadGitSecrets)
-    workingDir(project.rootDir)
-    val path = "$buildDir${File.pathSeparator}"
-    val patchendEnv = environment.apply { replace("PATH", path + getOrDefault("PATH", "")) }
-    environment = patchendEnv
-
-    commandLine("/bin/sh", "$buildDir/git-secrets", "--register-aws")
-
-    // cleaner than having multiple separate exec tasks
-    doLast {
-        exec {
-            workingDir(project.rootDir)
-            commandLine("git", "config", "--add", "secrets.allowed", "123456789012")
-        }
-
-        exec {
-            workingDir(project.rootDir)
-            environment = patchendEnv
-            commandLine("/bin/sh", "$buildDir/git-secrets", "--scan")
-        }
-    }
-}
-
-tasks.findByName("check")?.let {
-    it.dependsOn(gitSecrets)
-}
+//val downloadGitSecrets = tasks.register<Download>("downloadGitSecrets") {
+//    src("https://raw.githubusercontent.com/awslabs/git-secrets/master/git-secrets")
+//    dest("$buildDir/git-secrets")
+//    onlyIfModified(true)
+//    useETag(true)
+//}
+//
+//val gitSecrets = tasks.register<Exec>("gitSecrets") {
+//    onlyIf {
+//        !DefaultNativePlatform.getCurrentOperatingSystem().isWindows
+//    }
+//
+//    dependsOn(downloadGitSecrets)
+//    workingDir(project.rootDir)
+//    val path = "$buildDir${File.pathSeparator}"
+//    val patchendEnv = environment.apply { replace("PATH", path + getOrDefault("PATH", "")) }
+//    environment = patchendEnv
+//
+//    commandLine("/bin/sh", "$buildDir/git-secrets", "--register-aws")
+//
+//    // cleaner than having multiple separate exec tasks
+//    doLast {
+//        exec {
+//            workingDir(project.rootDir)
+//            commandLine("git", "config", "--add", "secrets.allowed", "123456789012")
+//        }
+//
+//        exec {
+//            workingDir(project.rootDir)
+//            environment = patchendEnv
+//            commandLine("/bin/sh", "$buildDir/git-secrets", "--scan")
+//        }
+//    }
+//}
+//
+//tasks.findByName("check")?.let {
+//    it.dependsOn(gitSecrets)
+//}
diff --git a/buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts b/buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts
@@ -55,8 +55,8 @@ val testJar = tasks.named<Jar>("testJar").configure {
 
 idea {
     module {
-        testSourceDirs = testSourceDirs + integrationTests.java.srcDirs
-        testResourceDirs = testResourceDirs + integrationTests.resources.srcDirs
+        testSources.from(integrationTests.java.srcDirs)
+        testResources.from(integrationTests.resources.srcDirs)
     }
 }
 val integrationTestConfiguration: Test.() -> Unit = {
diff --git a/buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts
@@ -1,8 +1,5 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
-import org.jetbrains.intellij.platform.gradle.tasks.BuildPluginTask
-import org.jetbrains.intellij.platform.gradle.tasks.PatchPluginXmlTask
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
 import software.aws.toolkits.gradle.buildMetadata
 import software.aws.toolkits.gradle.intellij.IdeVersions
@@ -18,19 +15,13 @@ val toolkitVersion: String by project
 // please check changelog generation logic if this format is changed
 version = "$toolkitVersion.${ideProfile.shortName}"
 
-// attach the current commit hash on local builds
-if (!project.isCi()) {
-    val buildMetadata = buildMetadata()
-    tasks.withType<PatchPluginXmlTask>().configureEach {
-        pluginVersion.set(buildMetadata.map { "${project.version}+$it" })
+intellijPlatform {
+    pluginConfiguration {
+        if (isCi()) {
+            version.set(buildMetadata().map { "${project.version}+$it" })
+        }
     }
 
-    tasks.named<BuildPluginTask>("buildPlugin") {
-        archiveClassifier.set(buildMetadata)
-    }
-}
-
-intellijPlatform {
     publishing {
         val publishToken: String by project
         val publishChannel: String by project
diff --git a/gradle.properties b/gradle.properties
@@ -30,5 +30,5 @@ 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=true
 #org.gradle.configuration-cache.problems=warn
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/plugins/amazonq/build.gradle.kts b/plugins/amazonq/build.gradle.kts
@@ -111,27 +111,26 @@ 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)
 
     val dest = layout.buildDirectory.dir("tmp/extractFlare")
     into(dest)
     from(downloadFlareArtifacts.map { it.outputFiles.filterNot { file -> file.name.endsWith(".zip") } })
-
-    doLast {
-        copy {
-            into(dest)
-            includeEmptyDirs = false
-            downloadFlareArtifacts.get().outputFiles.filter { it.name.endsWith(".zip") }.forEach {
-                dest.get().file(it.parentFile.name).asFile.createNewFile()
-                from(zipTree(it)) {
-                    include("*.js")
-                    include("*.txt")
-                }
-            }
-        }
-    }
+    includeEmptyDirs = false
+//
+//    doLast {
+//        copy {
+//            into(dest)
+//            downloadFlareArtifacts.get().outputFiles.filter { it.name.endsWith(".zip") }.forEach {
+//                dest.get().file(it.parentFile.name).asFile.createNewFile()
+//                from(zipTree(it)) {
+//                    include("*.js")
+//                    include("*.txt")
+//                }
+//            }
+//        }
+//    }
 }
 
 tasks.withType<PrepareSandboxTask>().configureEach {
diff --git a/plugins/core/resources/build.gradle.kts b/plugins/core/resources/build.gradle.kts
@@ -31,9 +31,6 @@ val download = tasks.register<Download>("downloadResources") {
     src(listOf("https://idetoolkits.amazonwebservices.com/endpoints.json"))
     onlyIfModified(true)
     useETag(true)
-    doFirst {
-        mkdir(resourcesDir)
-    }
 }
 
 tasks.processResources {
diff --git a/plugins/toolkit/jetbrains-core/build.gradle.kts b/plugins/toolkit/jetbrains-core/build.gradle.kts
@@ -60,10 +60,10 @@ patchPluginXml.configure {
 }
 
 tasks.jar {
-    dependsOn(patchPluginXml, changelog)
-    from(changelog) {
-        into("META-INF")
-    }
+//    dependsOn(patchPluginXml, changelog)
+//    from(changelog) {
+//        into("META-INF")
+//    }
 
     from(patchPluginXml) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -40,7 +40,8 @@ pluginManagement {
 }
 
 plugins {
-    id("com.github.burrunan.s3-build-cache") version "1.5"
+    // https://github.com/burrunan/gradle-s3-build-cache/issues/118
+//    id("com.github.burrunan.s3-build-cache") version "1.5"
     id("com.gradle.develocity") version "3.17.6"
     id("org.jetbrains.intellij.platform.settings") version "2.7.1"
 }
@@ -72,25 +73,25 @@ buildscript {
     }
 }
 
-val regionEnv: Provider<String> = providers.environmentVariable("AWS_REGION")
-val bucketEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_BUCKET")
-val prefixEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_PREFIX")
-if (regionEnv.isPresent && bucketEnv.isPresent && prefixEnv.isPresent) {
-    // TODO: can we serve a remote cache out of CloudFront instead? https://docs.gradle.org/8.1/userguide/build_cache.html#sec:build_cache_configure_remote
-    buildCache {
-        local {
-            isEnabled = false
-        }
-
-        remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
-            region = regionEnv.get()
-            bucket = bucketEnv.get()
-            prefix = prefixEnv.get()
-            isPush = true
-            lookupDefaultAwsCredentials = true
-        }
-    }
-}
+//val regionEnv: Provider<String> = providers.environmentVariable("AWS_REGION")
+//val bucketEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_BUCKET")
+//val prefixEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_PREFIX")
+//if (regionEnv.isPresent && bucketEnv.isPresent && prefixEnv.isPresent) {
+//    // TODO: can we serve a remote cache out of CloudFront instead? https://docs.gradle.org/8.1/userguide/build_cache.html#sec:build_cache_configure_remote
+//    buildCache {
+//        local {
+//            isEnabled = false
+//        }
+//
+//        remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
+//            region = regionEnv.get()
+//            bucket = bucketEnv.get()
+//            prefix = prefixEnv.get()
+//            isPush = true
+//            lookupDefaultAwsCredentials = true
+//        }
+//    }
+//}
 
 develocity {
     buildScan {

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ val testJar = tasks.named<Jar>("testJar").configure {`
`55`	`55`
`56`	`56`	`idea {`
`57`	`57`	`module {`
`58`		`- testSourceDirs = testSourceDirs + integrationTests.java.srcDirs`
`59`		`- testResourceDirs = testResourceDirs + integrationTests.resources.srcDirs`
	`58`	`+ testSources.from(integrationTests.java.srcDirs)`
	`59`	`+ testResources.from(integrationTests.resources.srcDirs)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`val integrationTestConfiguration: Test.() -> Unit = {`