Skip to content

Commit 96c981d

Browse files
authored
Merge branch 'main' into dependabot/gradle/dependencies-e424ef699f
2 parents a68b570 + be451b4 commit 96c981d

9 files changed

Lines changed: 27 additions & 27 deletions

File tree

.github/workflows/main.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ jobs:
2121
java: [17, 21, 25]
2222

2323
steps:
24-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2525

2626
- name: Set up JDK
27-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
27+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
2828
with:
2929
java-version: ${{ matrix.java }}
3030
distribution: "temurin"
3131
cache: gradle
3232

3333
# Use the open-source basic cache provider
3434
- name: Set up Gradle
35-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
35+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
3636
with:
3737
cache-provider: basic
3838

@@ -41,7 +41,7 @@ jobs:
4141

4242
- if: matrix.java == 17
4343
name: Upload coverage to Codecov
44-
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
44+
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
4545
continue-on-error: true
4646
with:
4747
token: ${{ secrets.CODECOV_TOKEN }}
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-latest
5454

5555
steps:
56-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
56+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5757

5858
- name: Verify versions match
5959
run: |
@@ -88,20 +88,20 @@ jobs:
8888
packages: write
8989

9090
steps:
91-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
91+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9292

9393
- name: Set up JDK
94-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
94+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
9595
with:
9696
java-version: 17
9797
distribution: "temurin"
9898

9999
- name: Validate Gradle wrapper
100-
uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
100+
uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
101101

102102
# Use the open-source basic cache provider
103103
- name: Setup Gradle
104-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
104+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
105105
with:
106106
cache-provider: basic
107107

@@ -124,20 +124,20 @@ jobs:
124124
packages: write
125125

126126
steps:
127-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
127+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
128128

129129
- name: Set up JDK
130-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
130+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
131131
with:
132132
java-version: 17
133133
distribution: "temurin"
134134

135135
- name: Validate Gradle wrapper
136-
uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
136+
uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
137137

138138
# Use the open-source basic cache provider
139139
- name: Setup Gradle
140-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
140+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
141141
with:
142142
cache-provider: basic
143143

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
37+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3838
with:
3939
persist-credentials: false
4040

examples/basic-examples/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'application'
33
id 'com.diffplug.spotless' version '8.0.0'
4-
id 'org.jetbrains.kotlin.jvm' version '2.3.21'
4+
id 'org.jetbrains.kotlin.jvm' version '2.4.0'
55
}
66

77
application {
@@ -19,7 +19,7 @@ repositories {
1919
}
2020

2121
ext {
22-
jacksonVersion = "2.21.0"
22+
jacksonVersion = "2.22.0"
2323
}
2424

2525
dependencies {

examples/basic-examples/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

examples/basic-examples/gradlew

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/opentelemetry/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ repositories {
7575

7676
ext {
7777
fgaSdkVersion = "0.9.9" // x-release-please-version
78-
openTelemetryVersion = "1.62.0"
79-
openTelemetryAlphaVersion = "1.62.0-alpha"
78+
openTelemetryVersion = "1.63.0"
79+
openTelemetryAlphaVersion = "1.63.0-alpha"
8080
}
8181

8282
dependencies {
@@ -96,7 +96,7 @@ dependencies {
9696
implementation("io.opentelemetry:opentelemetry-exporter-prometheus:$openTelemetryAlphaVersion")
9797
implementation("io.opentelemetry:opentelemetry-exporter-otlp:$openTelemetryVersion")
9898
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$openTelemetryVersion")
99-
implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.41.1")
99+
implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.42.0")
100100

101101
// Environment variables for this example
102102
implementation("io.github.cdimascio:dotenv-java:3.2.0")

examples/opentelemetry/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
retries=0
66
retryBackOffMs=500

examples/opentelemetry/gradlew

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/opentelemetry/gradlew.bat

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)