Skip to content

Commit f9a6e49

Browse files
chore: Update Gradle plugins (#190)
1 parent b10b09c commit f9a6e49

File tree

8 files changed

+19
-12
lines changed

8 files changed

+19
-12
lines changed

bitrise.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ workflows:
314314
inputs:
315315
- content: |-
316316
set -exo pipefail
317-
../bitrise-build-cache-cli activate gradle -d --cache
317+
../bitrise-build-cache-cli activate gradle -d --cache --cache-push
318318
- script:
319319
title: Print ~/.init.d/bitrise-build-cache.init.gradle.kts
320320
inputs:
@@ -374,7 +374,7 @@ workflows:
374374
inputs:
375375
- content: |-
376376
set -exo pipefail
377-
../bitrise-build-cache-cli activate gradle -d --cache
377+
../bitrise-build-cache-cli activate gradle -d --cache --cache-push
378378
- script:
379379
title: Print ~/.init.d/bitrise-build-cache.init.gradle.kts
380380
inputs:
@@ -434,7 +434,7 @@ workflows:
434434
inputs:
435435
- content: |-
436436
set -exo pipefail
437-
../bitrise-build-cache-cli activate gradle -d --cache
437+
../bitrise-build-cache-cli activate gradle -d --cache --cache-push
438438
- script:
439439
title: Print ~/.init.d/bitrise-build-cache.init.gradle.kts
440440
inputs:
@@ -686,7 +686,7 @@ workflows:
686686
inputs:
687687
- content: |-
688688
set -exo pipefail
689-
../bitrise-build-cache-cli activate gradle -d --cache
689+
../bitrise-build-cache-cli activate gradle -d --cache --cache-push
690690
- script:
691691
title: Print ~/.init.d/bitrise-build-cache.init.gradle.kts
692692
inputs:
@@ -750,7 +750,7 @@ workflows:
750750
inputs:
751751
- content: |-
752752
set -exo pipefail
753-
../bitrise-build-cache-cli activate gradle -d --cache
753+
../bitrise-build-cache-cli activate gradle -d --cache --cache-push
754754
- script:
755755
title: Print ~/.init.d/bitrise-build-cache.init.gradle.kts
756756
inputs:

cmd/gradle/asset/verification-metadata.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,12 @@
196196
<sha256 value="811015785d28c73dc1c649142b0b2981ce279e378d47e8c06c22b1e8d8343e91" origin="Generated by Gradle"/>
197197
</artifact>
198198
</component>
199-
<component group="io.bitrise.gradle" name="gradle-analytics" version="2.1.36">
200-
<artifact name="gradle-analytics-2.1.36.jar">
201-
<sha256 value="286bee92573c60e1c5032db815351e6d1592e0271ce9b021e666133233ac5043" origin="Generated by Gradle"/>
199+
<component group="io.bitrise.gradle" name="gradle-analytics" version="2.2.0">
200+
<artifact name="gradle-analytics-2.2.0.jar">
201+
<sha256 value="9c71cc1d04a57f0e4956fd1c8a89c0013c122fef7da97674d7cba4b172ec476a" origin="Generated by Gradle"/>
202202
</artifact>
203-
<artifact name="gradle-analytics-2.1.36.module">
204-
<sha256 value="ef4c7b53294b0d5346e19af4430095629d1bc66781a519c4d072d46053991950" origin="Generated by Gradle"/>
203+
<artifact name="gradle-analytics-2.2.0.module">
204+
<sha256 value="cedf6089c74525998168ae4a9326321db62af2ac54a97b5ef4a7c52b20b7080d" origin="Generated by Gradle"/>
205205
</artifact>
206206
</component>
207207
<component group="io.bitrise.gradle" name="remote-cache" version="1.2.24">

internal/config/gradle/activate_for_gradle_params.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ func (params ActivateGradleParams) analyticsTemplateInventory(
200200
Endpoint: consts.GradleAnalyticsEndpoint,
201201
Port: consts.GradleAnalyticsPort,
202202
HTTPEndpoint: consts.GradleAnalyticsHTTPEndpoint,
203+
GRPCEndpoint: consts.GradleAnalyticsGRPCEndpoint,
203204
}
204205
}
205206

internal/config/gradle/activate_for_gradle_params_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ func Test_activateGradleParams(t *testing.T) {
220220
Endpoint: consts.GradleAnalyticsEndpoint,
221221
Port: consts.GradleAnalyticsPort,
222222
HTTPEndpoint: consts.GradleAnalyticsHTTPEndpoint,
223+
GRPCEndpoint: consts.GradleAnalyticsGRPCEndpoint,
223224
},
224225
TestDistro: TestDistroTemplateInventory{
225226
Usage: UsageLevelNone,

internal/config/gradle/gradle_init_template_inventory.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type AnalyticsTemplateInventory struct {
2323
Endpoint string
2424
Port int
2525
HTTPEndpoint string
26+
GRPCEndpoint string
2627
}
2728

2829
type TestDistroTemplateInventory struct {

internal/config/gradle/gradleconfig_generate_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ func Test_GenerateInitGradle(t *testing.T) {
8686
Endpoint: "AnalyticsEndpointURLValue",
8787
Port: 123,
8888
HTTPEndpoint: "AnalyticsHttpEndpointValue",
89+
GRPCEndpoint: "AnalyticsGRPCEndpointValue",
8990
},
9091
TestDistro: TestDistroTemplateInventory{
9192
Usage: UsageLevelEnabled,
@@ -170,6 +171,7 @@ settingsEvaluated {
170171
extensions.configure(AnalyticsPluginExtension::class.java) {
171172
endpoint.set("AnalyticsEndpointURLValue:123")
172173
httpEndpoint.set("AnalyticsHttpEndpointValue")
174+
grpcEndpoint.set("AnalyticsGRPCEndpointValue")
173175
authToken.set("AuthTokenValue")
174176
dumpEventsToFiles.set(true)
175177
debug.set(true)

internal/config/gradle/initd.gradle.kts.gotemplate

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ settingsEvaluated {
6060
extensions.configure(AnalyticsPluginExtension::class.java) {
6161
endpoint.set("{{ .Analytics.Endpoint }}:{{ .Analytics.Port }}")
6262
httpEndpoint.set("{{ .Analytics.HTTPEndpoint }}")
63+
grpcEndpoint.set("{{ .Analytics.GRPCEndpoint }}")
6364
authToken.set("{{ .Common.AuthToken }}")
6465
dumpEventsToFiles.set({{ .Common.Debug }})
6566
debug.set({{ .Common.Debug }})

internal/consts/consts.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ const (
1616
GradleRemoteBuildCachePluginDepVersion = "1.2.24"
1717

1818
// Gradle Analytics related consts
19-
GradleAnalyticsPluginDepVersion = "2.1.36"
19+
GradleAnalyticsPluginDepVersion = "2.2.0"
2020
GradleAnalyticsEndpoint = "gradle-analytics.services.bitrise.io"
21-
GradleAnalyticsHTTPEndpoint = "https://gradle-sink.services.bitrise.io"
2221
GradleAnalyticsPort = 443
22+
GradleAnalyticsHTTPEndpoint = "https://gradle-sink.services.bitrise.io"
23+
GradleAnalyticsGRPCEndpoint = "grpcs://gradle-analytics.services.bitrise.io:444"
2324

2425
// Gradle Common Plugin version
2526
GradleCommonPluginDepVersion = "1.0.5"

0 commit comments

Comments
 (0)