Skip to content

Commit b89b203

Browse files
authored
Merge branch 'main' into dependabot/gradle/samples/kotlin-mcp-server/mcp-kotlin-0.9.0
2 parents 55b9d8a + 0e1eef3 commit b89b203

9 files changed

Lines changed: 44 additions & 40 deletions

File tree

.github/workflows/apidocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
cache: gradle
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@v5
37+
uses: gradle/actions/setup-gradle@v6
3838

3939
- name: Generate Dokka Site
4040
run: |-
@@ -47,4 +47,4 @@ jobs:
4747

4848
- name: Deploy to GitHub Pages
4949
id: deployment
50-
uses: actions/deploy-pages@v4
50+
uses: actions/deploy-pages@v5

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: npm ci
6464

6565
- name: Setup Gradle
66-
uses: gradle/actions/setup-gradle@v5
66+
uses: gradle/actions/setup-gradle@v6
6767
with:
6868
validate-wrappers: true
6969
add-job-summary: 'always'
@@ -106,7 +106,7 @@ jobs:
106106

107107
- name: Upload coverage reports to Codecov
108108
if: ${{ !cancelled() && matrix.os == 'ubuntu-latest' }}
109-
uses: codecov/codecov-action@v5
109+
uses: codecov/codecov-action@v6
110110
with:
111111
token: ${{ secrets.CODECOV_TOKEN }}
112112
report_type: coverage
@@ -115,7 +115,7 @@ jobs:
115115

116116
- name: Upload test results to Codecov
117117
if: ${{ !cancelled() && matrix.os == 'ubuntu-latest' }}
118-
uses: codecov/codecov-action@v5
118+
uses: codecov/codecov-action@v6
119119
with:
120120
token: ${{ secrets.CODECOV_TOKEN }}
121121
report_type: test_results
@@ -151,7 +151,7 @@ jobs:
151151
distribution: ${{ env.JAVA_DISTRIBUTION }}
152152

153153
- name: Setup Gradle
154-
uses: gradle/actions/setup-gradle@v5
154+
uses: gradle/actions/setup-gradle@v6
155155
with:
156156
validate-wrappers: true
157157
add-job-summary: 'always'
@@ -193,7 +193,7 @@ jobs:
193193
distribution: ${{ env.JAVA_DISTRIBUTION }}
194194

195195
- name: Setup Gradle
196-
uses: gradle/actions/setup-gradle@v5
196+
uses: gradle/actions/setup-gradle@v6
197197
with:
198198
add-job-summary: 'always'
199199
cache-read-only: true

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
build-mode: manual
4141

4242
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@v5
43+
uses: gradle/actions/setup-gradle@v6
4444
with:
4545
validate-wrappers: true
4646
cache-read-only: true

.github/workflows/conformance.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
distribution: ${{ env.JAVA_DISTRIBUTION }}
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@v5
37+
uses: gradle/actions/setup-gradle@v6
3838
with:
3939
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
4040

@@ -85,7 +85,7 @@ jobs:
8585
distribution: ${{ env.JAVA_DISTRIBUTION }}
8686

8787
- name: Setup Gradle
88-
uses: gradle/actions/setup-gradle@v5
88+
uses: gradle/actions/setup-gradle@v6
8989
with:
9090
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
9191

@@ -116,7 +116,7 @@ jobs:
116116
distribution: ${{ env.JAVA_DISTRIBUTION }}
117117

118118
- name: Setup Gradle
119-
uses: gradle/actions/setup-gradle@v5
119+
uses: gradle/actions/setup-gradle@v6
120120
with:
121121
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
122122

@@ -155,7 +155,7 @@ jobs:
155155
distribution: ${{ env.JAVA_DISTRIBUTION }}
156156

157157
- name: Setup Gradle
158-
uses: gradle/actions/setup-gradle@v5
158+
uses: gradle/actions/setup-gradle@v6
159159
with:
160160
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
161161

.github/workflows/gradle-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
distribution: 'temurin'
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@v5
28+
uses: gradle/actions/setup-gradle@v6
2929

3030
- name: Build
3131
run: ./gradlew build --rerun-tasks --max-workers 2 --continue

.github/workflows/samples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
distribution: ${{ env.JAVA_DISTRIBUTION }}
4646

4747
- name: Setup Gradle
48-
uses: gradle/actions/setup-gradle@v5
48+
uses: gradle/actions/setup-gradle@v6
4949
with:
5050
validate-wrappers: true
5151
add-job-summary: 'always'

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ kover = "0.9.8"
99
ktlint = "14.2.0"
1010
knit = "0.5.1"
1111
mavenPublish = "0.36.0"
12-
netty = "4.2.10.Final"
12+
netty = "4.2.12.Final"
1313
openapi-generator = "7.21.0"
1414

1515
# libraries version
@@ -19,7 +19,7 @@ coroutines = "1.10.2"
1919
kotest = "6.1.3"
2020
kotlinx-io = "0.8.2"
2121
ktor = "3.2.3"
22-
logging = "7.0.14"
22+
logging = "8.0.01"
2323
mockk = "1.14.9"
2424
mokksy = "0.8.0"
2525
serialization = "1.9.0"

integration-test/src/jvmTest/typescript/package-lock.json

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

integration-test/src/jvmTest/typescript/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"dependencies": {
1212
"@modelcontextprotocol/sdk": "^1.28.0",
1313
"express": "^5.2.1",
14-
"zod": "^4.3.5"
14+
"zod": "^4.3.6"
1515
},
1616
"devDependencies": {
1717
"@types/cors": "^2.8.19",
1818
"@types/express": "^5.0.6",
19-
"@types/node": "^24.10.6",
20-
"cors": "^2.8.5",
19+
"@types/node": "^25.5.0",
20+
"cors": "^2.8.6",
2121
"tsx": "^4.21.0",
22-
"typescript": "^5.9.3"
22+
"typescript": "^6.0.2"
2323
}
2424
}

0 commit comments

Comments
 (0)