From 727334ab1569b0ff16509bca35f093d945f1d541 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Sun, 23 Jun 2024 15:26:41 +0200 Subject: [PATCH] use embedded-kotlin to build plugins Gradle uses an embedded version of Kotlin. Gradle Plugins should not expose a different version of Kotlin as a dependency, to avoid causing conflicts with other Gradle Plugins. Also, remove kotlin-stdlib-jdk8 - it is identical to kotlin-stdlib --- build.gradle.kts | 2 +- buildlogic/build.gradle.kts | 4 +-- core/build.gradle.kts | 4 +-- gcpbuildcache/build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 --- gradle/verification-keyring.keys | 45 ++++++++++++++++++++++++++++++++ gradle/verification-metadata.xml | 12 +++++++++ s3buildcache/build.gradle.kts | 2 +- settings.gradle.kts | 12 +-------- 9 files changed, 64 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4a9b191..5d531cd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,5 +16,5 @@ */ plugins { - alias(libs.plugins.kotlin.jvm) apply false + base } diff --git a/buildlogic/build.gradle.kts b/buildlogic/build.gradle.kts index 3de2c1a..d9fbc04 100644 --- a/buildlogic/build.gradle.kts +++ b/buildlogic/build.gradle.kts @@ -17,7 +17,7 @@ plugins { id("java-gradle-plugin") - alias(libs.plugins.kotlin.jvm) + `embedded-kotlin` } kotlin { @@ -33,4 +33,4 @@ gradlePlugin { implementationClass = "androidx.build.BundlePlugin" } } -} \ No newline at end of file +} diff --git a/core/build.gradle.kts b/core/build.gradle.kts index ee402ec..c3a8504 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -16,14 +16,12 @@ */ plugins { - alias(libs.plugins.kotlin.jvm) + `embedded-kotlin` } dependencies { implementation(gradleApi()) implementation(platform(libs.okhttp.bom)) - api(platform(libs.kotlin.bom)) - api(libs.kotlin.stdlib) implementation(libs.retrofit.core) implementation(libs.retrofit.converter.gson) implementation(libs.google.gson) diff --git a/gcpbuildcache/build.gradle.kts b/gcpbuildcache/build.gradle.kts index d89a720..f5e205f 100644 --- a/gcpbuildcache/build.gradle.kts +++ b/gcpbuildcache/build.gradle.kts @@ -20,7 +20,7 @@ plugins { id("signing") id("bundle") alias(libs.plugins.gradle.publish) - alias(libs.plugins.kotlin.jvm) + `embedded-kotlin` } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d180a26..326bb7a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] gradle-publish = "1.1.0" -kotlin = "1.9.22" amazon-bom = "2.25.0" google-cloud-storage = "2.30.1" s3-mock = "2.11.0" @@ -10,8 +9,6 @@ protobuf = "3.25.1" okhttp-bom = "4.12.0" [libraries] -kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" } -kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" } amazon-bom = { group = "software.amazon.awssdk", name = "bom", version.ref = "amazon-bom" } amazon-s3 = { group = "software.amazon.awssdk", name = "s3" } amazon-sso = { group = "software.amazon.awssdk", name = "sso" } @@ -26,5 +23,4 @@ okhttp-bom = { group = "com.squareup.okhttp3", name = "okhttp-bom", version.ref okhttp = { group = "com.squareup.okhttp3", name = "okhttp" } [plugins] -kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } gradle-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-publish" } diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 0f047d1..e5e8099 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -1533,6 +1533,51 @@ vCSIy8lzRw19ZO9G7qhjcHLc =vO0K -----END PGP PUBLIC KEY BLOCK----- +pub E2F38302C8075E3D +uid Gradle Inc. + +sub 1B80C80E07BC7190 +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.68 + +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 +=Rl7p +-----END PGP PUBLIC KEY BLOCK----- + pub E3822B59020A349D uid Kotlin Libraries Release diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5041f98..33e8722 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -49,6 +49,7 @@ + @@ -199,6 +200,7 @@ + @@ -225,6 +227,16 @@ + + + + + + + + + + diff --git a/s3buildcache/build.gradle.kts b/s3buildcache/build.gradle.kts index 814fda0..35d30e2 100644 --- a/s3buildcache/build.gradle.kts +++ b/s3buildcache/build.gradle.kts @@ -20,7 +20,7 @@ plugins { id("signing") id("bundle") alias(libs.plugins.gradle.publish) - alias(libs.plugins.kotlin.jvm) + `embedded-kotlin` } dependencies { diff --git a/settings.gradle.kts b/settings.gradle.kts index 9b2d693..d8bf3c4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,16 +15,6 @@ * */ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.4.2/userguide/multi_project_builds.html - * This project uses @Incubating APIs which are subject to change. - */ - pluginManagement { repositories { mavenCentral() @@ -43,4 +33,4 @@ rootProject.name = "gcp-gradle-build-cache" include("core") include("gcpbuildcache") include("s3buildcache") -includeBuild("buildlogic") \ No newline at end of file +includeBuild("buildlogic")