Bump some libs and cleanup some Gradle warnings (#3197)

rli · web-flow · commit 1982471abf4a · 2022-07-06T22:07:33.000-07:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,8 +12,8 @@ plugins {
     id("org.jetbrains.gradle.plugin.idea-ext")
 }
 
-val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL").forUseAtConfigurationTime()
-val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN").forUseAtConfigurationTime()
+val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
 
 allprojects {
     repositories {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,22 +15,22 @@ plugins {
 // Note: We can't use our standard source layout due to https://github.com/gradle/gradle/issues/14310
 
 dependencies {
-    compileOnly(deps.jacoco)
-    implementation(deps.aws.codeGen)
-    implementation(deps.bundles.jackson)
-    implementation(deps.commonmark)
-    implementation(deps.gradlePlugin.detekt)
-    implementation(deps.gradlePlugin.intellij)
-    implementation(deps.gradlePlugin.kotlin)
-    implementation(deps.gradlePlugin.testLogger)
-    implementation(deps.gradlePlugin.testRetry)
-    implementation(deps.jgit)
+    compileOnly(libs.jacoco)
+    implementation(libs.aws.codeGen)
+    implementation(libs.bundles.jackson)
+    implementation(libs.commonmark)
+    implementation(libs.gradlePlugin.detekt)
+    implementation(libs.gradlePlugin.intellij)
+    implementation(libs.gradlePlugin.kotlin)
+    implementation(libs.gradlePlugin.testLogger)
+    implementation(libs.gradlePlugin.testRetry)
+    implementation(libs.jgit)
 
-    testImplementation(deps.assertj)
-    testImplementation(deps.junit4)
-    testImplementation(deps.bundles.mockito)
+    testImplementation(libs.assertj)
+    testImplementation(libs.junit4)
+    testImplementation(libs.bundles.mockito)
 
-    testRuntimeOnly(deps.junit5.jupiterVintage)
+    testRuntimeOnly(libs.junit5.jupiterVintage)
 }
 
 tasks.test {
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -1,12 +1,11 @@
 // Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL").forUseAtConfigurationTime()
-val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN").forUseAtConfigurationTime()
+val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")
+val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")
 
 dependencyResolutionManagement {
     versionCatalogs {
-        // TODO: Using "libs" seems to confuse Intellij?
-        create("deps") {
+        create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.gradle
 
+import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
 /**
@@ -15,3 +16,6 @@ fun Project.ciOnly(block: () -> Unit) {
 }
 
 fun Project.isCi() : Boolean = providers.environmentVariable("CI").isPresent
+
+val jvmTarget = JavaVersion.VERSION_11
+val kotlinTarget = "1.5"
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -173,7 +173,7 @@ object IdeVersions {
         ideProfiles[it] ?: throw IllegalStateException("Can't find profile for $it")
     }
 
-    private fun resolveIdeProfileName(providers: ProviderFactory): Provider<String> = providers.gradleProperty("ideProfileName").forUseAtConfigurationTime()
+    private fun resolveIdeProfileName(providers: ProviderFactory): Provider<String> = providers.gradleProperty("ideProfileName")
 }
 
 open class ProductProfile(
diff --git a/buildSrc/src/main/kotlin/toolkit-detekt.gradle.kts b/buildSrc/src/main/kotlin/toolkit-detekt.gradle.kts
@@ -1,5 +1,6 @@
 // Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
     id("io.gitlab.arturbosch.detekt")
@@ -9,7 +10,7 @@ plugins {
 // TODO: https://github.com/gradle/gradle/issues/15383
 val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 dependencies {
-    detektPlugins(versionCatalog.findDependency("detekt-formattingRules").get())
+    detektPlugins(versionCatalog.findLibrary("detekt-formattingRules").get())
     detektPlugins(project(":detekt-rules"))
 }
 
@@ -22,8 +23,11 @@ detekt {
     config = files("$rulesProject/detekt.yml")
     autoCorrect = true
 
+}
+
+tasks.withType<Detekt> {
     reports {
-        html.enabled = true // Human readable report
-        xml.enabled = true // Checkstyle like format for CI tool integrations
+        html.required.set(true) // Human readable report
+        xml.required.set(true) // Checkstyle like format for CI tool integrations
     }
 }
diff --git a/buildSrc/src/main/kotlin/toolkit-generate-sdks.gradle.kts b/buildSrc/src/main/kotlin/toolkit-generate-sdks.gradle.kts
@@ -25,8 +25,8 @@ sourceSets {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = software.aws.toolkits.gradle.jvmTarget
+    targetCompatibility = software.aws.toolkits.gradle.jvmTarget
 }
 
 tasks.withType<JavaCompile>().configureEach {
diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
@@ -61,11 +61,11 @@ configurations {
     // TODO: https://github.com/gradle/gradle/issues/15383
     val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
     dependencies {
-        testImplementation(platform(versionCatalog.findDependency("junit5-bom").get()))
-        testImplementation(versionCatalog.findDependency("junit5-jupiterApi").get())
+        testImplementation(platform(versionCatalog.findLibrary("junit5-bom").get()))
+        testImplementation(versionCatalog.findLibrary("junit5-jupiterApi").get())
 
-        testRuntimeOnly(versionCatalog.findDependency("junit5-jupiterEngine").get())
-        testRuntimeOnly(versionCatalog.findDependency("junit5-jupiterVintage").get())
+        testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterEngine").get())
+        testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterVintage").get())
     }
 }
 
@@ -150,7 +150,7 @@ tasks.runIde {
     systemProperty("ide.plugins.snapshot.on.unload.fail", true)
     systemProperty("memory.snapshots.path", project.rootDir)
 
-    val alternativeIde = providers.environmentVariable("ALTERNATIVE_IDE").forUseAtConfigurationTime()
+    val alternativeIde = providers.environmentVariable("ALTERNATIVE_IDE")
     if (alternativeIde.isPresent) {
         // remove the trailing slash if there is one or else it will not work
         val value = alternativeIde.get()
diff --git a/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts
@@ -15,9 +15,9 @@ plugins {
 val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 dependencies {
     implementation(versionCatalog.findBundle("kotlin").get())
-    implementation(versionCatalog.findDependency("kotlin-coroutines").get())
+    implementation(versionCatalog.findLibrary("kotlin-coroutines").get())
 
-    testImplementation(versionCatalog.findDependency("kotlin-test").get())
+    testImplementation(versionCatalog.findLibrary("kotlin-test").get())
 }
 
 sourceSets {
@@ -40,26 +40,27 @@ sourceSets {
     }
 }
 
+val javaVersion = software.aws.toolkits.gradle.jvmTarget
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }
 
 tasks.withType<KotlinCompile>().all {
-    kotlinOptions.jvmTarget = "11"
-    kotlinOptions.apiVersion = "1.4"
+    kotlinOptions.jvmTarget = javaVersion.majorVersion
+    kotlinOptions.apiVersion = software.aws.toolkits.gradle.kotlinTarget
 }
 
 tasks.withType<Detekt>().configureEach {
-    jvmTarget = "11"
+    jvmTarget = javaVersion.majorVersion
     dependsOn(":detekt-rules:assemble")
     exclude("build/**")
     exclude("**/*.Generated.kt")
     exclude("**/TelemetryDefinitions.kt")
 }
 
 tasks.withType<DetektCreateBaselineTask>().configureEach {
-    jvmTarget = "11"
+    jvmTarget = javaVersion.majorVersion
     dependsOn(":detekt-rules:assemble")
     exclude("build/**")
     exclude("**/*.Generated.kt")
diff --git a/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts b/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
 dependencies {
     testImplementation(versionCatalog.findBundle("mockito").get())
-    testImplementation(versionCatalog.findDependency("assertj").get())
+    testImplementation(versionCatalog.findLibrary("assertj").get())
 
     // Don't add a test framework by default since we use junit4, junit5, and testng depending on project
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,13 +7,17 @@ detekt = "1.20.0"
 intellijGradle = "1.7.0-20220613.010908-17"
 intellijRemoteRobot = "0.11.14"
 jackson = "2.11.1"
-jacoco = "0.8.7"
+jacoco = "0.8.8"
 jgit = "5.11.0.202103091610-r"
 junit4 = "4.13.2"
 junit5 = "5.8.2"
-kotlin = "1.6.10"
-kotlinCoroutines = "1.3.9"
-mockito = "4.0.0"
+# https://plugins.jetbrains.com/docs/intellij/kotlin.html#adding-kotlin-support
+# https://kotlinlang.org/docs/releases.html#release-details
+# TODO: 221+ seems to have binary compat issues with 1.7.0
+kotlin = "1.6.21"
+kotlinCoroutines = "1.5.0"
+mockito = "4.6.1"
+mockitoKotlin = "4.0.0"
 telemetryGenerator = "1.0.53"
 testLogger = "3.1.0"
 testRetry = "1.2.1"
@@ -79,7 +83,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-stdLibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
 telemetryGenerator = { module = "software.aws.toolkits:telemetry-generator", version.ref = "telemetryGenerator" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 wiremock = { module = "com.github.tomakehurst:wiremock", version.ref = "wiremock" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,5 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-enableFeaturePreview("VERSION_CATALOGS")
-
 rootProject.name = "aws-toolkit-jetbrains"
 
 include("resources")
@@ -29,9 +27,9 @@ gradleEnterprise {
     }
 }
 
-val regionEnv: Provider<String> = providers.environmentVariable("AWS_REGION").forUseAtConfigurationTime()
-val bucketEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_BUCKET").forUseAtConfigurationTime()
-val prefixEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_PREFIX").forUseAtConfigurationTime()
+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) {
     buildCache {
         local {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ plugins {`
`12`	`12`	`id("org.jetbrains.gradle.plugin.idea-ext")`
`13`	`13`	`}`
`14`	`14`
`15`		`-val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL").forUseAtConfigurationTime()`
`16`		`-val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN").forUseAtConfigurationTime()`
	`15`	`+val codeArtifactUrl: Provider<String> = providers.environmentVariable("CODEARTIFACT_URL")`
	`16`	`+val codeArtifactToken: Provider<String> = providers.environmentVariable("CODEARTIFACT_AUTH_TOKEN")`
`17`	`17`
`18`	`18`	`allprojects {`
`19`	`19`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ object IdeVersions {`
`173`	`173`	`ideProfiles[it] ?: throw IllegalStateException("Can't find profile for $it")`
`174`	`174`	`}`
`175`	`175`
`176`		`- private fun resolveIdeProfileName(providers: ProviderFactory): Provider<String> = providers.gradleProperty("ideProfileName").forUseAtConfigurationTime()`
	`176`	`+ private fun resolveIdeProfileName(providers: ProviderFactory): Provider<String> = providers.gradleProperty("ideProfileName")`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`open class ProductProfile(`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ sourceSets {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`java {`
`28`		`- sourceCompatibility = JavaVersion.VERSION_11`
`29`		`- targetCompatibility = JavaVersion.VERSION_11`
	`28`	`+ sourceCompatibility = software.aws.toolkits.gradle.jvmTarget`
	`29`	`+ targetCompatibility = software.aws.toolkits.gradle.jvmTarget`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`tasks.withType<JavaCompile>().configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ plugins {`
`14`	`14`	`val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")`
`15`	`15`	`dependencies {`
`16`	`16`	`testImplementation(versionCatalog.findBundle("mockito").get())`
`17`		`- testImplementation(versionCatalog.findDependency("assertj").get())`
	`17`	`+ testImplementation(versionCatalog.findLibrary("assertj").get())`
`18`	`18`
`19`	`19`	`// Don't add a test framework by default since we use junit4, junit5, and testng depending on project`
`20`	`20`	`}`