Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use embedded-kotlin to build plugins #59

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use embedded-kotlin to build plugins #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
*/

plugins {
alias(libs.plugins.kotlin.jvm) apply false
base
}
4 changes: 2 additions & 2 deletions buildlogic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

plugins {
id("java-gradle-plugin")
alias(libs.plugins.kotlin.jvm)
`embedded-kotlin`
}

kotlin {
Expand All @@ -33,4 +33,4 @@ gradlePlugin {
implementationClass = "androidx.build.BundlePlugin"
}
}
}
}
4 changes: 1 addition & 3 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gcpbuildcache/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id("signing")
id("bundle")
alias(libs.plugins.gradle.publish)
alias(libs.plugins.kotlin.jvm)
`embedded-kotlin`
}

dependencies {
Expand Down
4 changes: 0 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand All @@ -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" }
45 changes: 45 additions & 0 deletions gradle/verification-keyring.keys
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,6 +1533,51 @@ vCSIy8lzRw19ZO9G7qhjcHLc
=vO0K
-----END PGP PUBLIC KEY BLOCK-----

pub E2F38302C8075E3D
uid Gradle Inc. <maven-publishing@gradle.com>

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 <kt-libraries@jetbrains.com>

Expand Down
12 changes: 12 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
<trusted-key id="1597AB231B7ADD7E14B1D9C43F00DB67AE236E2E" group="org.conscrypt"/>
<trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
<trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
<trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.2.1"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the name and the version, it is good enough to trust the whole group.

<trusted-key id="1FA37FBE4453C1073E7EF61D6449005F96BC97A3" group="de.undercouch"/>
<trusted-key id="2518174F4111F02779592A6F9757D7E7E06DD2AC" group="io.prometheus"/>
<trusted-key id="28118C070CB22A0175A2E8D43D12CA2AC19F3181">
Expand Down Expand Up @@ -199,6 +200,7 @@
<components>
<component group="com.datastax.oss" name="java-driver-bom" version="4.14.1">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just add this to ? It seems to be properly signed and has a signature

https://repo1.maven.org/maven2/com/datastax/oss/java-driver-bom/4.14.1/

https://keyserver.ubuntu.com/pks/lookup?search=0x2DC48CBB4352B4953AF6F803D433B437192A0FD1&fingerprint=on&op=index

<artifact name="java-driver-bom-4.14.1.pom">
<pgp value="2DC48CBB4352B4953AF6F803D433B437192A0FD1"/>
<sha256 value="73046e3a868d402ea1316d739f498dd859a504b809ac8fa9ff238e5758202728" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
Expand All @@ -225,6 +227,16 @@
<sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.gradle.kotlin.embedded-kotlin" name="org.gradle.kotlin.embedded-kotlin.gradle.plugin" version="4.2.1">
<artifact name="org.gradle.kotlin.embedded-kotlin.gradle.plugin-4.2.1.pom">
<sha256 value="815ad76bae01b458bb0532375062baa3fb407247bd961092b92de14f1d5c33d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.gradle.kotlin.kotlin-dsl" name="org.gradle.kotlin.kotlin-dsl.gradle.plugin" version="4.2.1">
<artifact name="org.gradle.kotlin.kotlin-dsl.gradle.plugin-4.2.1.pom">
<sha256 value="311ff9eca17b0f6c9cc8104ebb88c73d38a4985a0488b01670bc2be09e5a2320" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="org.infinispan" name="infinispan-bom" version="11.0.15.Final">
<artifact name="infinispan-bom-11.0.15.Final.pom">
<sha256 value="07386ee62c8464618770d209f8c060da8e51f56e76314d1b29caec9c302130e9" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down
2 changes: 1 addition & 1 deletion s3buildcache/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id("signing")
id("bundle")
alias(libs.plugins.gradle.publish)
alias(libs.plugins.kotlin.jvm)
`embedded-kotlin`
}

dependencies {
Expand Down
12 changes: 1 addition & 11 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -43,4 +33,4 @@ rootProject.name = "gcp-gradle-build-cache"
include("core")
include("gcpbuildcache")
include("s3buildcache")
includeBuild("buildlogic")
includeBuild("buildlogic")
Loading