Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 4.0.0-beta.3 #933

Merged
merged 11 commits into from
Aug 3, 2023
Merged

release 4.0.0-beta.3 #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6ba2986
add jda-nas for linux musl (#920)
topi314 Jul 21, 2023
6672f0d
update lavaplayer to 08cfbc0 - Fixed ogg streaming
topi314 Jul 21, 2023
9ac3eb8
add new config option to readme env vars
topi314 Jul 21, 2023
f543fa9
fixup some readme things
topi314 Jul 21, 2023
83d6f59
readd hardware support section in readme
topi314 Jul 21, 2023
c79ffaa
update changelog for v4.0.0-beta.2
topi314 Jul 21, 2023
df60936
Merge branch 'master' into dev
topi314 Jul 21, 2023
fe31640
update lavaplayer version to 74e6c4d728
topi314 Jul 28, 2023
dd84b42
Merge branch 'master' into dev
topi314 Aug 2, 2023
507b610
add missing env variables in github workflows
topi314 Aug 2, 2023
9d85bed
use lavalink lavaplayer fork 2.0.0 (#931)
topi314 Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ on:
required: false
MAVEN_PASSWORD:
required: false
ORG_GRADLE_PROJECT_mavenCentralPassword:
required: false
ORG_GRADLE_PROJECT_mavenCentralUsername:
required: false
ORG_GRADLE_PROJECT_signingInMemoryKey:
required: false
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword:
required: false

jobs:
build:
Expand All @@ -29,6 +37,10 @@ jobs:
DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ jobs:
DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}

release:
needs: build
Expand Down
6 changes: 3 additions & 3 deletions LavalinkServer/src/main/java/lavalink/server/player/AudioLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ class AudioLoader(
private val loadResult = CompletableFuture<LoadResult>()
private val used = AtomicBoolean(false)

fun load(identifier: String?): CompletionStage<LoadResult> {
fun load(identifier: String?): LoadResult {
val isUsed = used.getAndSet(true)
check(!isUsed) { "This loader can only be used once per instance" }
log.trace("Loading item with identifier $identifier")
audioPlayerManager.loadItem(identifier, this)
return loadResult
audioPlayerManager.loadItemSync(identifier, this)
return loadResult.get()
}

override fun trackLoaded(audioTrack: AudioTrack) {
Expand Down
5 changes: 2 additions & 3 deletions LavalinkServer/src/main/java/lavalink/server/player/AudioLoaderRestHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,9 @@ class AudioLoaderRestHandler(
fun loadTracks(
request: HttpServletRequest,
@RequestParam identifier: String
): CompletionStage<ResponseEntity<LoadResult>> {
): ResponseEntity<LoadResult> {
log.info("Got request to load for identifier \"${identifier}\"")
return AudioLoader(audioPlayerManager, pluginInfoModifiers).load(identifier)
.thenApply { ResponseEntity.ok(it) }
return ResponseEntity.ok(AudioLoader(audioPlayerManager, pluginInfoModifiers).load(identifier))
}

@GetMapping("/v4/decodetrack")
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ fun VersionCatalogBuilder.spring() {
}

fun VersionCatalogBuilder.voice() {
version("lavaplayer", "08cfbc0595")
version("lavaplayer", "2.0.0")

library("lavaplayer", "com.github.walkyst.lavaplayer-fork", "lavaplayer").versionRef("lavaplayer")
library("lavaplayer-ip-rotator", "com.github.walkyst.lavaplayer-fork", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer")
library("lavaplayer", "dev.arbjerg", "lavaplayer").versionRef("lavaplayer")
library("lavaplayer-ip-rotator", "dev.arbjerg", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer")
library("lavadsp", "dev.arbjerg", "lavadsp").version("0.7.8")

library("koe", "moe.kyokobot.koe", "core").version("2.0.0-rc1")
Expand Down