Skip to content

Commit 2328f3a

Browse files
Merge branch 'main' into chore/upgrade-spotless-to-8.2.1
2 parents 2a0c5ff + b7e1cdb commit 2328f3a

7 files changed

Lines changed: 145 additions & 122 deletions

File tree

Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
.PHONY: help test test-integration lint fmt
1+
.PHONY: help build test test-integration lint fmt clean all
22

33
# Default target when 'make' is run without arguments
44
help:
55
@echo "Available targets:"
6-
@echo " test - Run unit tests"
6+
@echo " build - Compile the project"
7+
@echo " test - Run unit tests"
78
@echo " test-integration - Run integration tests"
8-
@echo " lint - Run static analysis and checkstyle"
9-
@echo " fmt - Auto-format code using Spotless"
9+
@echo " lint - Run static analysis and checkstyle"
10+
@echo " fmt - Auto-format code using Spotless"
11+
@echo " clean - Clean build artifacts"
12+
@echo " all - Run all tests and lint"
13+
14+
# Compile the project
15+
build:
16+
./gradlew assemble
1017

1118
# Run unit tests
1219
test:
@@ -24,11 +31,9 @@ lint:
2431
fmt:
2532
./gradlew spotlessApply
2633

27-
2834
# Clean build artifacts
2935
clean:
3036
./gradlew clean
3137

32-
# Run all tests
38+
# Run all tests and lint
3339
all: test lint
34-
@echo "All checks completed"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ OpenFGA is designed to make it easy for application builders to model their perm
7676

7777
The OpenFGA Java SDK is available on [Maven Central](https://central.sonatype.com/).
7878

79-
The OpenFGA Java SDK currently supports **Java 11** as the minimum JDK version.
79+
The OpenFGA Java SDK currently supports **Java 17** as the minimum JDK version.
8080

8181
It can be used with the following:
8282

build.gradle

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

5757
ext {
58-
jackson_version = "2.20.1"
58+
jackson_version = "2.21.0"
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.8"
70+
implementation "org.openapitools:jackson-databind-nullable:0.2.9"
7171

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

@@ -81,7 +81,7 @@ testing {
8181
dependencies {
8282
implementation 'org.assertj:assertj-core:3.27.7'
8383
implementation 'org.mockito:mockito-core:5.21.0'
84-
implementation 'org.junit.jupiter:junit-jupiter:5.14.1'
84+
implementation 'org.junit.jupiter:junit-jupiter:5.14.2'
8585
implementation 'org.wiremock:wiremock:3.13.2'
8686

8787
runtimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -105,7 +105,6 @@ testing {
105105
}
106106

107107
integration(JvmTestSuite) {
108-
testType = TestSuiteType.INTEGRATION_TEST
109108
useJUnitJupiter()
110109

111110
dependencies {
@@ -144,7 +143,7 @@ testing {
144143
// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
145144
spotless {
146145
// comment out below to run spotless as part of the `check` task
147-
enforceCheck false
146+
enforceCheck = false
148147
format 'misc', {
149148
// define the files (e.g. '*.gradle', '*.md') to apply `misc` to
150149
target '.gitignore'

gradle/wrapper/gradle-wrapper.jar

-16.8 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

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

0 commit comments

Comments
 (0)