Skip to content

Commit 8cd7014

Browse files
authored
Merge branch 'main' into feat/release-automation
2 parents 1952b87 + 00ad715 commit 8cd7014

12 files changed

Lines changed: 19 additions & 16 deletions

File tree

.github/dependabot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ updates:
4848
directory: "/"
4949
schedule:
5050
interval: "monthly"
51+
ignore:
52+
- dependency-name: "gradle/actions/setup-gradle"
53+
versions: [">= 6.0.0, < 7.0.0"]
5154
groups:
5255
dependencies:
5356
patterns:

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jacocoTestReport {
5555
}
5656

5757
ext {
58-
jackson_version = "2.21.1"
58+
jackson_version = "2.21.2"
5959
}
6060

6161
dependencies {
@@ -67,10 +67,10 @@ dependencies {
6767
implementation "com.fasterxml.jackson.core:jackson-annotations"
6868
implementation "com.fasterxml.jackson.core:jackson-databind"
6969
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
70-
implementation "org.openapitools:jackson-databind-nullable:0.2.9"
70+
implementation "org.openapitools:jackson-databind-nullable:0.2.10"
7171

7272
// ---- OpenTelemetry ----
73-
implementation platform("io.opentelemetry:opentelemetry-bom:1.59.0")
73+
implementation platform("io.opentelemetry:opentelemetry-bom:1.60.1")
7474
implementation "io.opentelemetry:opentelemetry-api"
7575
}
7676

@@ -80,7 +80,7 @@ testing {
8080
useJUnitJupiter()
8181
dependencies {
8282
implementation 'org.assertj:assertj-core:3.27.7'
83-
implementation 'org.mockito:mockito-core:5.22.0'
83+
implementation 'org.mockito:mockito-core:5.23.0'
8484
implementation 'org.junit.jupiter:junit-jupiter:5.14.3'
8585
implementation 'org.wiremock:wiremock:3.13.2'
8686

@@ -113,8 +113,8 @@ testing {
113113
implementation "com.fasterxml.jackson.core:jackson-core"
114114
implementation "com.fasterxml.jackson.core:jackson-databind"
115115

116-
implementation "org.testcontainers:testcontainers-junit-jupiter:2.0.3"
117-
implementation "org.testcontainers:testcontainers-openfga:2.0.3"
116+
implementation "org.testcontainers:testcontainers-junit-jupiter:2.0.4"
117+
implementation "org.testcontainers:testcontainers-openfga:2.0.4"
118118
implementation project()
119119
}
120120

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.10'
4+
id 'org.jetbrains.kotlin.jvm' version '2.3.20'
55
}
66

77
application {
@@ -30,7 +30,7 @@ dependencies {
3030
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
3131
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
3232
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
33-
implementation("org.openapitools:jackson-databind-nullable:0.2.9")
33+
implementation("org.openapitools:jackson-databind-nullable:0.2.10")
3434

3535
// Kotlin
3636
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
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.3.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

examples/basic-examples/gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/opentelemetry/build.gradle

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

7676
ext {
7777
fgaSdkVersion = "0.9.7"
78-
openTelemetryVersion = "1.59.0"
79-
openTelemetryAlphaVersion = "1.59.0-alpha"
78+
openTelemetryVersion = "1.60.1"
79+
openTelemetryAlphaVersion = "1.60.1-alpha"
8080
}
8181

8282
dependencies {
2.73 KB
Binary file not shown.

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.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

examples/opentelemetry/gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/wrapper/gradle-wrapper.jar

2.73 KB
Binary file not shown.

0 commit comments

Comments
 (0)