Skip to content

Commit ae073ab

Browse files
committed
Merge remote-tracking branch 'origin/main' into resuming
Conflict because of 87cba00
2 parents 6e8aacf + 6ccb3ec commit ae073ab

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

.github/workflows/build-prs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
group: ${{ github.ref }}
1111
cancel-in-progress: true
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
path: './'
1616
fetch-depth: 0
17-
- name: Set up JDK 17
18-
uses: actions/setup-java@v3
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
1919
with:
2020
java-version: 21
2121
distribution: zulu

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434
with:
3535
fetch-depth: 0
3636

3737
- name: Setup Java
38-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3939
with:
4040
distribution: zulu
4141
java-version: 21
@@ -48,7 +48,7 @@ jobs:
4848
run: ./gradlew build publish --no-daemon -x test
4949

5050
- name: Upload Artifacts
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5252
with:
5353
name: Lavalink-Client.zip
5454
path: |

.github/workflows/docs-branch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
contents: read
2020
deployments: write
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525
- uses: actions/setup-java@v4
@@ -31,7 +31,7 @@ jobs:
3131
run: ./gradlew --no-daemon dokkaHtml dokkaJavadoc
3232
- name: Copy javadoc subfolder
3333
run: mv build/dokka/javadoc build/dokka/html/ && cp dokka/includes/404.html build/dokka/html/
34-
- uses: actions/upload-pages-artifact@v1
34+
- uses: actions/upload-pages-artifact@v3
3535
with:
3636
path: 'build/dokka/html'
3737
- uses: cloudflare/pages-action@v1

.github/workflows/docs-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
contents: read
2020
deployments: write
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
ref: "${{ github.event.pull_request.merge_commit_sha }}"
2525
fetch-depth: 0
@@ -32,7 +32,7 @@ jobs:
3232
run: ./gradlew --no-daemon dokkaHtml dokkaJavadoc
3333
- name: Copy javadoc subfolder
3434
run: mv build/dokka/javadoc build/dokka/html/ && cp dokka/includes/404.html build/dokka/html/
35-
- uses: actions/upload-pages-artifact@v1
35+
- uses: actions/upload-pages-artifact@v3
3636
with:
3737
path: 'build/dokka/html'
3838
- uses: cloudflare/pages-action@v1

.github/workflows/docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
contents: read
1717
deployments: write
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
2222
- uses: actions/setup-java@v4
@@ -28,7 +28,7 @@ jobs:
2828
run: ./gradlew --no-daemon dokkaHtml dokkaJavadoc
2929
- name: Copy javadoc subfolder
3030
run: mv build/dokka/javadoc build/dokka/html/ && cp dokka/includes/404.html build/dokka/html/
31-
- uses: actions/upload-pages-artifact@v1
31+
- uses: actions/upload-pages-artifact@v3
3232
with:
3333
path: 'build/dokka/html'
3434
- uses: cloudflare/pages-action@v1

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Download Artifacts
26-
uses: actions/download-artifact@v3
26+
uses: actions/download-artifact@v4
2727
with:
2828
name: Lavalink-Client.zip
2929

src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import reactor.util.retry.Retry
2929
import java.io.Closeable
3030
import java.io.IOException
3131
import java.time.Duration
32-
import java.util.*
32+
import java.util.Collections
3333
import java.util.concurrent.ConcurrentHashMap
3434
import java.util.concurrent.TimeUnit
3535
import java.util.function.Consumer

0 commit comments

Comments
 (0)