Fix settings that compile but don't actually do anything (#3207)

Author: rli

build.gradle.kts

@@ -1,6 +1,5 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 import org.jetbrains.gradle.ext.ProjectSettings
 import org.jetbrains.gradle.ext.TaskTriggersConfig
 import software.aws.toolkits.gradle.changelog.tasks.GenerateGithubChangeLog
@@ -14,8 +13,17 @@ plugins {
 
 allprojects {
     repositories {
-        val codeArtifactMavenRepo: ((RepositoryHandler) -> Unit)? by extra
-        codeArtifactMavenRepo?.invoke(this)
+        val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+        val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
+        if (codeArtifactUrl.isPresent && codeArtifactToken.isPresent) {
+            maven {
+                url = uri(codeArtifactUrl.get())
+                credentials {
+                    username = "aws"
+                    password = codeArtifactToken.get()
+                }
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }

buildSrc/settings.gradle.kts

@@ -1,10 +1,25 @@
 // Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-pluginManagement {
-    repositories {
-        val codeArtifactMavenRepo: ((RepositoryHandler) -> Unit)? by extra
-        codeArtifactMavenRepo?.invoke(this)
-        gradlePluginPortal()
+val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
+    val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+    val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
+    return if (codeArtifactUrl.isPresent && codeArtifactToken.isPresent) {
+        maven {
+            url = uri(codeArtifactUrl.get())
+            credentials {
+                username = "aws"
+                password = codeArtifactToken.get()
+            }
+        }
+    } else {
+        null
+    }
+}.also {
+    pluginManagement {
+        repositories {
+            it()
+            gradlePluginPortal()
+        }
     }
 }
 
@@ -16,8 +31,7 @@ dependencyResolutionManagement {
     }
 
     repositories {
-        val codeArtifactMavenRepo: ((RepositoryHandler) -> Unit)? by extra
-        codeArtifactMavenRepo?.invoke(this)
+        codeArtifactMavenRepo()
         mavenCentral()
         gradlePluginPortal()
         maven {

settings.gradle.kts

@@ -1,32 +1,23 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
-    val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
-    val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
-    return if (codeArtifactUrl.isPresent && codeArtifactToken.isPresent) {
-        println("Using CodeArtifact proxy: ${codeArtifactUrl.get()}")
-        maven {
-            url = uri(codeArtifactUrl.get())
-            credentials {
-                username = "aws"
-                password = codeArtifactToken.get()
+pluginManagement {
+    repositories {
+        val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+        val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
+        if (codeArtifactUrl.isPresent && codeArtifactToken.isPresent) {
+            println("Using CodeArtifact proxy: ${codeArtifactUrl.get()}")
+            maven {
+                url = uri(codeArtifactUrl.get())
+                credentials {
+                    username = "aws"
+                    password = codeArtifactToken.get()
+                }
             }
         }
-    } else {
-        null
-    }
-}.also {
-    pluginManagement {
-        repositories {
-            // janky because we need to apply to plugins in this file, but val falls out of scope
-            it()
-            gradlePluginPortal()
-        }
+        gradlePluginPortal()
     }
 }
 
-extra["codeArtifactMavenRepo"] = codeArtifactMavenRepo
-
 rootProject.name = "aws-toolkit-jetbrains"
 
 include("resources")