Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release notes for GCP backed Gradle Remote Cache

## 1.0.0-beta01

- Update various dependencies (Kotlin, google-cloud-storage, Gradle plugin publish plugin)

## 1.0.0-alpha06

- Warn when a user incorrectly configures GCP bucket to be used for the cache.
Expand Down
8 changes: 4 additions & 4 deletions gcpbuildcache/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ plugins {
id("java-gradle-plugin")
id("maven-publish")
id("signing")
id("com.gradle.plugin-publish") version "1.0.0-rc-1"
id("org.jetbrains.kotlin.jvm") version "1.6.20"
id("com.gradle.plugin-publish") version "1.0.0"
id("org.jetbrains.kotlin.jvm") version "1.7.10"
}

repositories {
Expand All @@ -30,7 +30,7 @@ repositories {
dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("com.google.cloud:google-cloud-storage:2.6.0")
implementation("com.google.cloud:google-cloud-storage:2.9.3")
}

pluginBundle {
Expand All @@ -53,7 +53,7 @@ gradlePlugin {
}

group = "androidx.build.gradle.gcpbuildcache"
version = "1.0.0-alpha06"
version = "1.0.0-beta01"

testing {
suites {
Expand Down
60 changes: 54 additions & 6 deletions gradle/verification-keyring.keys
Original file line number Diff line number Diff line change
Expand Up @@ -5391,24 +5391,72 @@ Jqg9YirnHcrlYF0r
=gukc
-----END PGP PUBLIC KEY BLOCK-----

pub 571A5291E827E1C7
uid Central Repository sync with maven.java.net (Used for signing artifacts that support syncing maven.java.net with the Central Repository) <central@sonatype.com>

-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: Hostname:
Version: Hockeypuck ~unreleased
Version: BCPG v1.68

xsDiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8
RSCCRr7A8m6y83npkTVDW6m2oFN2cjFwPLm/vxg1gu5pO+NCwz5iBRHdewCg1idO
Gl6gBAZVNteCRMVnGnX4EhMD/RaYBO2j511h7gR+p+6BBeJTEIA1+tsi+GhTBkS9
mUMGuD9Z8PyvwL7quGQyXJ/kTe3eB6iyDFn0oemB1w736FQe3vcIX6eePOEiDZs5
1Uepv7bXI4wn1i3Z3kzynXNKcjCd5ZxAmML5VlQ0zWeE0W18reCjt1P5q5xxBFjw
0L8WA/9aPi4d5VPakzuDvxfKK29BogScTLn2C3fpEnqWsTfpoWSkNXkRsoB4jUU4
oIqRFMTxwsjUmjVUPOG+YqoeAaVpj+RBpp+V+CqgfNWpnH4caxzODE9f+6RYRCGm
LSq/6OmgZg6t38M5XWVpvk7Ixygs6Vrd99VZyIQPJwSBM/pvA82fQ2VudHJhbCBS
LSq/6OmgZg6t38M5XWVpvk7Ixygs6Vrd99VZyIQPJwSBM/pvA7SfQ2VudHJhbCBS
ZXBvc2l0b3J5IHN5bmMgd2l0aCBtYXZlbi5qYXZhLm5ldCAoVXNlZCBmb3Igc2ln
bmluZyBhcnRpZmFjdHMgdGhhdCBzdXBwb3J0IHN5bmNpbmcgbWF2ZW4uamF2YS5u
ZXQgd2l0aCB0aGUgQ2VudHJhbCBSZXBvc2l0b3J5KSA8Y2VudHJhbEBzb25hdHlw
ZS5jb20+wmAEExECACAFAk9iFawCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
ZS5jb20+iGAEExECACAFAk9iFawCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
CRBXGlKR6Cfhx0GuAJ497rs0V5ZsLuKaJw91EnPmwn5x/wCfbCh/AZ1+6AqvAaSl
84Y498fRoPE=
=jgOR
=oQxC
-----END PGP PUBLIC KEY BLOCK-----

pub 2e5b73c6efd2eb453104c2eae6ec76b4c6d3ae8e

-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: Hostname:
Version: Hockeypuck 2.1.0-152-ga266fd3

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
MmIzscVR5uuvPq1m2aUkkKLFWLBqkpuelMmW
=sQk1
-----END PGP PUBLIC KEY BLOCK-----
34 changes: 9 additions & 25 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework"/>
<trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch"/>
<trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains"/>
<trusted-key id="314fe82e5a4c5377bca2edec5208812e1e4a6db0" group="com.gradle.publish"/>
<trusted-key id="44fbdbbc1a00fe414f1c1873586654072ead6677" group="org.sonatype.oss"/>
<trusted-key id="47504b76cf89c15c0512d9afe16ab52d79fd224f">
<trusting group="com.google.api-client"/>
Expand All @@ -40,7 +41,10 @@
<trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee" group="com.github.gundy"/>
<trusted-key id="571a5291e827e1c7" group="net.java"/>
<trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
<trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
<trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83">
<trusting group="org.jetbrains.kotlin"/>
<trusting group="org.jetbrains.kotlin.jvm"/>
</trusted-key>
<trusted-key id="72385ff0af338d52" group="72385ff0af338d52"/>
<trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
<trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs"/>
Expand Down Expand Up @@ -71,6 +75,7 @@
<trusting group="com.google.http-client"/>
<trusting group="com.google.oauth-client"/>
</trusted-key>
<trusted-key id="e6ec76b4c6d3ae8e" group="com.google.protobuf"/>
<trusted-key id="e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb" group="org.jetbrains.kotlinx"/>
<trusted-key id="fa77dcfef2ee6eb2debedd2c012579464d01c06a">
<trusting group="org.apache"/>
Expand All @@ -84,30 +89,9 @@
</trusted-keys>
</configuration>
<components>
<component group="com.gradle.plugin-publish" name="com.gradle.plugin-publish.gradle.plugin" version="1.0.0-rc-1">
<artifact name="com.gradle.plugin-publish.gradle.plugin-1.0.0-rc-1.pom">
<sha256 value="db9ac49301762e98435eda79be03a1663b20bad0973d47f6d9efc838e0e21e26" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.gradle.publish" name="plugin-publish-plugin" version="1.0.0-rc-1">
<artifact name="plugin-publish-plugin-1.0.0-rc-1.jar">
<sha256 value="25ca7e09a2e5dc87b1105eb56e1d054d0ccf5e3ca88e70ef65640251fdd80492" origin="Generated by Gradle"/>
</artifact>
<artifact name="plugin-publish-plugin-1.0.0-rc-1.pom">
<sha256 value="c7e99c1b83b036fc9b2181e4d1a17b18b0bd68e2cf2a4e4c38c7d95b81c571f8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="de.undercouch" name="gradle-download-task" version="4.1.1">
<artifact name="gradle-download-task-4.1.1.pom">
<ignored-keys>
<ignored-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" />
</ignored-keys>
<sha256 value="1109f1f71a54254d590337d8b9d443f9dfc08728c9c1d8335655cc1dcc88c0b9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.6.20">
<artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.6.20.pom">
<sha256 value="eb30990a12cace57fd1e2c0484fe482e0cdb9ba680e4b15996d9324495638903" origin="Generated by Gradle"/>
<component group="com.gradle.plugin-publish" name="com.gradle.plugin-publish.gradle.plugin" version="1.0.0">
<artifact name="com.gradle.plugin-publish.gradle.plugin-1.0.0.pom">
<sha256 value="8e5a9777545442f2c5cf29c0abb264269bc8950d96546d0963e51c34ae95e28a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.sonatype.oss" name="oss-parent" version="7">
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 7 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@

rootProject.name = "gcp-gradle-build-cache"
include("gcpbuildcache")

pluginManagement {
repositories {
mavenCentral()
gradlePluginPortal()
}
}