[Build] Bump Gradle version to 8.1.1

#KTI-1221 In Progress

buildSrc/build.gradle.kts

@@ -133,13 +133,10 @@ fun Project.samWithReceiver(configure: org.jetbrains.kotlin.samWithReceiver.grad
     extensions.configure("samWithReceiver", configure)
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
+    compilerOptions {
-        allWarningsAsErrors = true
+        allWarningsAsErrors.set(true)
-        freeCompilerArgs += listOf(
+        optIn.add("kotlin.ExperimentalStdlibApi")
-            "-opt-in=kotlin.RequiresOptIn",
+        freeCompilerArgs.add("-Xsuppress-version-warnings")
-            "-Xsuppress-version-warnings",
-            "-opt-in=kotlin.ExperimentalStdlibApi"
-        )
     }
 }
 

buildSrc/src/main/kotlin/CommonUtil.kt

@@ -14,6 +14,7 @@ import org.gradle.api.tasks.bundling.AbstractArchiveTask
 import org.gradle.kotlin.dsl.*
 import proguard.gradle.ProGuardTask
 import java.io.File
+import java.util.*
 import java.util.concurrent.Callable
 
 inline fun <reified T : Task> Project.task(noinline configuration: T.() -> Unit) = tasks.registering(T::class, configuration)
@@ -91,4 +92,8 @@ val Project.isIdeaActive
     get() = providers.systemProperty("idea.active").isPresent
 
 val Project.intellijCommunityDir: File
-    get() = rootDir.resolve("intellij/community").takeIf { it.isDirectory } ?: rootDir.resolve("intellij")
+    get() = rootDir.resolve("intellij/community").takeIf { it.isDirectory } ?: rootDir.resolve("intellij")
+
+fun String.capitalize(): String = capitalize(Locale.ROOT)
+
+fun String.capitalize(locale: Locale): String = replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() }

buildSrc/src/main/kotlin/GradleCommon.kt

@@ -356,7 +356,10 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
                             tasks.named<JavaCompile>(compileJavaTaskName).get().apply {
                                 attribute(
                                     TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE,
-                                    targetCompatibility.toInt()
+                                    when (targetCompatibility) {
+                                        "1.8" -> 8
+                                        else -> targetCompatibility.toInt()
+                                    }
                                 )
                             }
                         }

buildSrc/src/main/kotlin/common-configuration.gradle.kts

@@ -1,3 +1,4 @@
+import org.gradle.internal.deprecation.DeprecatableConfiguration
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper
 
 // Contains common configuration that should be applied to all projects
@@ -14,7 +15,7 @@ dependencies {
         configurations.all {
             if (isCanBeResolved && !isCanBeConsumed) {
                 allDependencies.configureEach {
-                    if (group == "com.google.code.gson" && name == "gson") {
+                    if (group == "com.google.code.gson" && name == "gson" && (this as? DeprecatableConfiguration)?.isCanBeDeclaredAgainst == true) { // isCanBeDeclaredAgainst will be a part of the public API since 8.2 https://github.com/gradle/gradle/pull/24823
                         this@constraints.add(this@all.name, "com.google.code.gson:gson") {
                             version {
                                 require(gsonVersion)

buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt

@@ -5,6 +5,7 @@
 
 package plugins
 
+import capitalize
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.attributes.Usage

gradle/verification-metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.1.xsd">
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.2.xsd">
    <configuration>
       <verify-metadata>true</verify-metadata>
       <verify-signatures>false</verify-signatures>
@@ -6891,12 +6891,6 @@
             <sha256 value="d51048567b64e1be4bba6f66260b28b67e2d044dd161164489dcc894d783d3fe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="2.1.7">
-         <artifact name="gradle-kotlin-dsl-plugins-2.1.7.jar">
-            <md5 value="b8c2f81d00941a5ac0f8bcf867ac3c74" origin="Generated by Gradle"/>
-            <sha256 value="4f2d4ae1bffd47a5a5cd83bb963d901edf6f886fc6ffc934d94d4ad05c7d8467" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="2.4.1">
          <artifact name="gradle-kotlin-dsl-plugins-2.4.1.jar">
             <md5 value="7462ba941d9e4044ded02d946e97c5f0" origin="Generated by Gradle"/>

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
+distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotlin-native/build-tools/build.gradle.kts

@@ -73,12 +73,13 @@ val compileKotlin: KotlinCompile by tasks
 val compileGroovy: GroovyCompile by tasks
 
 compileKotlin.apply {
-    kotlinOptions {
+    compilerOptions {
-        freeCompilerArgs += listOf(
+        optIn.add("kotlin.ExperimentalStdlibApi")
+        freeCompilerArgs.addAll(
+            listOf(
                 "-Xskip-prerelease-check",
                 "-Xsuppress-version-warnings",
-                "-opt-in=kotlin.ExperimentalStdlibApi",
+            )
-                "-opt-in=kotlin.RequiresOptIn"
         )
     }
 }

kotlin-native/libllvmext/build.gradle.kts

@@ -43,6 +43,7 @@ native {
         OSX -> {
             cxxflags += "-DKONAN_MACOS=1"
         }
+        else -> Unit
     }
     suffixes {
         (".cpp" to ".$obj") {

kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanBaseTasks.kt

@@ -25,11 +25,11 @@ import org.gradle.api.attributes.Attribute
 import org.gradle.api.attributes.AttributeContainer
 import org.gradle.api.attributes.Usage
 import org.gradle.api.capabilities.Capability
+import org.gradle.api.internal.component.DefaultSoftwareComponentVariant
 import org.gradle.api.internal.component.UsageContext
 import org.gradle.api.internal.tasks.DefaultTaskDependency
 import org.gradle.api.tasks.*
 import org.gradle.language.cpp.CppBinary
-import org.gradle.language.cpp.internal.DefaultUsageContext
 import org.gradle.nativeplatform.Linkage
 import org.jetbrains.kotlin.gradle.plugin.experimental.internal.compatibleVariantIdentity
 import org.jetbrains.kotlin.gradle.plugin.konan.*
@@ -119,17 +119,15 @@ abstract class KonanArtifactTask: KonanTargetableTask(), KonanArtifactSpec {
             val linkUsage = objectFactory.named(Usage::class.java, Usage.NATIVE_LINK)
             val konanSoftwareComponent = config.mainVariant
             val variantName = "${artifactNameWithoutSuffix}_${target.name}"
-            val context = DefaultUsageContext(object:UsageContext {
+            val context = DefaultSoftwareComponentVariant(
-                @Suppress("OVERRIDE_DEPRECATION")
+                    "${variantName}Link",
-                override fun getUsage(): Usage = linkUsage
+                    platformConfiguration.attributes,
-                override fun getName(): String = "${variantName}Link"
+                    platformConfiguration.allArtifacts,
-                override fun getCapabilities(): MutableSet<out Capability> = mutableSetOf()
+                    mutableSetOf(),
-                override fun getDependencies(): MutableSet<out ModuleDependency> = mutableSetOf()
+                    mutableSetOf(),
-                override fun getDependencyConstraints(): MutableSet<out DependencyConstraint> = mutableSetOf()
+                    mutableSetOf(),
-                override fun getArtifacts(): MutableSet<out PublishArtifact> = platformConfiguration.allArtifacts
+                    emptySet(),
-                override fun getAttributes(): AttributeContainer = platformConfiguration.attributes
+            )
-                override fun getGlobalExcludes(): Set<ExcludeRule> = emptySet()
-            }, platformConfiguration.allArtifacts, platformConfiguration)
             konanSoftwareComponent.addVariant(
                 compatibleVariantIdentity(
                     project,

repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt

@@ -141,7 +141,8 @@ class CodeConformanceTest : TestCase() {
                 "repo/gradle-settings-conventions/build-cache/build/generated-sources",
                 "repo/gradle-settings-conventions/jvm-toolchain-provisioning/build/generated-sources",
                 "repo/gradle-settings-conventions/gradle-enterprise/build/generated-sources",
-                "repo/gradle-settings-conventions/kotlin-daemon-config/build/generated-sources"
+                "repo/gradle-settings-conventions/kotlin-daemon-config/build/generated-sources",
+                ".gradle/expanded",
             )
         )
     }