Skip to content

Commit 67957f2

Browse files
authored
Merge pull request #26 from androidx/beta01
Go to 1.0.0-beta01
2 parents 89488af + 4d366ad commit 67957f2

File tree

6 files changed

+79
-36
lines changed

6 files changed

+79
-36
lines changed

RELEASE-NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release notes for GCP backed Gradle Remote Cache
22

3+
## 1.0.0-beta01
4+
5+
- Update various dependencies (Kotlin, google-cloud-storage, Gradle plugin publish plugin)
6+
37
## 1.0.0-alpha06
48

59
- Warn when a user incorrectly configures GCP bucket to be used for the cache.

gcpbuildcache/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ plugins {
1919
id("java-gradle-plugin")
2020
id("maven-publish")
2121
id("signing")
22-
id("com.gradle.plugin-publish") version "1.0.0-rc-1"
23-
id("org.jetbrains.kotlin.jvm") version "1.6.20"
22+
id("com.gradle.plugin-publish") version "1.0.0"
23+
id("org.jetbrains.kotlin.jvm") version "1.7.10"
2424
}
2525

2626
repositories {
@@ -30,7 +30,7 @@ repositories {
3030
dependencies {
3131
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
3232
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
33-
implementation("com.google.cloud:google-cloud-storage:2.6.0")
33+
implementation("com.google.cloud:google-cloud-storage:2.9.3")
3434
}
3535

3636
pluginBundle {
@@ -53,7 +53,7 @@ gradlePlugin {
5353
}
5454

5555
group = "androidx.build.gradle.gcpbuildcache"
56-
version = "1.0.0-alpha06"
56+
version = "1.0.0-beta01"
5757

5858
testing {
5959
suites {

gradle/verification-keyring.keys

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5391,24 +5391,72 @@ Jqg9YirnHcrlYF0r
53915391
=gukc
53925392
-----END PGP PUBLIC KEY BLOCK-----
53935393

5394+
pub 571A5291E827E1C7
5395+
uid Central Repository sync with maven.java.net (Used for signing artifacts that support syncing maven.java.net with the Central Repository) <[email protected]>
5396+
53945397
-----BEGIN PGP PUBLIC KEY BLOCK-----
5395-
Comment: Hostname:
5396-
Version: Hockeypuck ~unreleased
5398+
Version: BCPG v1.68
53975399

5398-
xsDiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
5400+
mQGiBE9iFawRBACJb4OMk3zqMDNvSJKYZ8fGYrPq7yCcf/ykKDkGb2dtPnAZGkSp
53995401
3mmNlTsU6s9ARn7BtkhIuM5TdbLs+z+okX62h3F0WW3h+CpfIXyKSgl7uWbhZ5G8
54005402
RSCCRr7A8m6y83npkTVDW6m2oFN2cjFwPLm/vxg1gu5pO+NCwz5iBRHdewCg1idO
54015403
Gl6gBAZVNteCRMVnGnX4EhMD/RaYBO2j511h7gR+p+6BBeJTEIA1+tsi+GhTBkS9
54025404
mUMGuD9Z8PyvwL7quGQyXJ/kTe3eB6iyDFn0oemB1w736FQe3vcIX6eePOEiDZs5
54035405
1Uepv7bXI4wn1i3Z3kzynXNKcjCd5ZxAmML5VlQ0zWeE0W18reCjt1P5q5xxBFjw
54045406
0L8WA/9aPi4d5VPakzuDvxfKK29BogScTLn2C3fpEnqWsTfpoWSkNXkRsoB4jUU4
54055407
oIqRFMTxwsjUmjVUPOG+YqoeAaVpj+RBpp+V+CqgfNWpnH4caxzODE9f+6RYRCGm
5406-
LSq/6OmgZg6t38M5XWVpvk7Ixygs6Vrd99VZyIQPJwSBM/pvA82fQ2VudHJhbCBS
5408+
LSq/6OmgZg6t38M5XWVpvk7Ixygs6Vrd99VZyIQPJwSBM/pvA7SfQ2VudHJhbCBS
54075409
ZXBvc2l0b3J5IHN5bmMgd2l0aCBtYXZlbi5qYXZhLm5ldCAoVXNlZCBmb3Igc2ln
54085410
bmluZyBhcnRpZmFjdHMgdGhhdCBzdXBwb3J0IHN5bmNpbmcgbWF2ZW4uamF2YS5u
54095411
ZXQgd2l0aCB0aGUgQ2VudHJhbCBSZXBvc2l0b3J5KSA8Y2VudHJhbEBzb25hdHlw
5410-
ZS5jb20+wmAEExECACAFAk9iFawCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
5412+
ZS5jb20+iGAEExECACAFAk9iFawCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
54115413
CRBXGlKR6Cfhx0GuAJ497rs0V5ZsLuKaJw91EnPmwn5x/wCfbCh/AZ1+6AqvAaSl
54125414
84Y498fRoPE=
5413-
=jgOR
5415+
=oQxC
5416+
-----END PGP PUBLIC KEY BLOCK-----
5417+
5418+
pub 2e5b73c6efd2eb453104c2eae6ec76b4c6d3ae8e
5419+
5420+
-----BEGIN PGP PUBLIC KEY BLOCK-----
5421+
Comment: Hostname:
5422+
Version: Hockeypuck 2.1.0-152-ga266fd3
5423+
5424+
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
5460+
MmIzscVR5uuvPq1m2aUkkKLFWLBqkpuelMmW
5461+
=sQk1
54145462
-----END PGP PUBLIC KEY BLOCK-----

gradle/verification-metadata.xml

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework"/>
3030
<trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch"/>
3131
<trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains"/>
32+
<trusted-key id="314fe82e5a4c5377bca2edec5208812e1e4a6db0" group="com.gradle.publish"/>
3233
<trusted-key id="44fbdbbc1a00fe414f1c1873586654072ead6677" group="org.sonatype.oss"/>
3334
<trusted-key id="47504b76cf89c15c0512d9afe16ab52d79fd224f">
3435
<trusting group="com.google.api-client"/>
@@ -40,7 +41,10 @@
4041
<trusted-key id="55e770230e69cc6de143fb5b62c82e50836eb3ee" group="com.github.gundy"/>
4142
<trusted-key id="571a5291e827e1c7" group="net.java"/>
4243
<trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
43-
<trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
44+
<trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83">
45+
<trusting group="org.jetbrains.kotlin"/>
46+
<trusting group="org.jetbrains.kotlin.jvm"/>
47+
</trusted-key>
4448
<trusted-key id="72385ff0af338d52" group="72385ff0af338d52"/>
4549
<trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
4650
<trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs"/>
@@ -71,6 +75,7 @@
7175
<trusting group="com.google.http-client"/>
7276
<trusting group="com.google.oauth-client"/>
7377
</trusted-key>
78+
<trusted-key id="e6ec76b4c6d3ae8e" group="com.google.protobuf"/>
7479
<trusted-key id="e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb" group="org.jetbrains.kotlinx"/>
7580
<trusted-key id="fa77dcfef2ee6eb2debedd2c012579464d01c06a">
7681
<trusting group="org.apache"/>
@@ -84,30 +89,9 @@
8489
</trusted-keys>
8590
</configuration>
8691
<components>
87-
<component group="com.gradle.plugin-publish" name="com.gradle.plugin-publish.gradle.plugin" version="1.0.0-rc-1">
88-
<artifact name="com.gradle.plugin-publish.gradle.plugin-1.0.0-rc-1.pom">
89-
<sha256 value="db9ac49301762e98435eda79be03a1663b20bad0973d47f6d9efc838e0e21e26" origin="Generated by Gradle"/>
90-
</artifact>
91-
</component>
92-
<component group="com.gradle.publish" name="plugin-publish-plugin" version="1.0.0-rc-1">
93-
<artifact name="plugin-publish-plugin-1.0.0-rc-1.jar">
94-
<sha256 value="25ca7e09a2e5dc87b1105eb56e1d054d0ccf5e3ca88e70ef65640251fdd80492" origin="Generated by Gradle"/>
95-
</artifact>
96-
<artifact name="plugin-publish-plugin-1.0.0-rc-1.pom">
97-
<sha256 value="c7e99c1b83b036fc9b2181e4d1a17b18b0bd68e2cf2a4e4c38c7d95b81c571f8" origin="Generated by Gradle"/>
98-
</artifact>
99-
</component>
100-
<component group="de.undercouch" name="gradle-download-task" version="4.1.1">
101-
<artifact name="gradle-download-task-4.1.1.pom">
102-
<ignored-keys>
103-
<ignored-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" />
104-
</ignored-keys>
105-
<sha256 value="1109f1f71a54254d590337d8b9d443f9dfc08728c9c1d8335655cc1dcc88c0b9" origin="Generated by Gradle"/>
106-
</artifact>
107-
</component>
108-
<component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.6.20">
109-
<artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.6.20.pom">
110-
<sha256 value="eb30990a12cace57fd1e2c0484fe482e0cdb9ba680e4b15996d9324495638903" origin="Generated by Gradle"/>
92+
<component group="com.gradle.plugin-publish" name="com.gradle.plugin-publish.gradle.plugin" version="1.0.0">
93+
<artifact name="com.gradle.plugin-publish.gradle.plugin-1.0.0.pom">
94+
<sha256 value="8e5a9777545442f2c5cf29c0abb264269bc8950d96546d0963e51c34ae95e28a" origin="Generated by Gradle"/>
11195
</artifact>
11296
</component>
11397
<component group="org.sonatype.oss" name="oss-parent" version="7">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-rc-5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@
2727

2828
rootProject.name = "gcp-gradle-build-cache"
2929
include("gcpbuildcache")
30+
31+
pluginManagement {
32+
repositories {
33+
mavenCentral()
34+
gradlePluginPortal()
35+
}
36+
}

0 commit comments

Comments
 (0)