Skip to content
This repository was archived by the owner on Nov 26, 2023. It is now read-only.

Commit d08d139

Browse files
duncte123duncte123
committed
Upgrade lavaplayer
1 parent a94d0fb commit d08d139

File tree

13 files changed

+165
-190
lines changed

13 files changed

+165
-190
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎.github/workflows/01-build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This workflow will build a Java project with Gradle
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
3+
4+
name: Build library
5+
6+
on:
7+
push:
8+
branches-ignore: [ master ]
9+
pull_request:
10+
branches-ignore: [ master ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Set up JDK 11
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: 11
23+
- name: Grant execute permission for gradlew
24+
run: chmod +x gradlew
25+
- name: Build with Gradle
26+
run: ./gradlew build

‎.github/workflows/02-publish.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# This workflow will build a Java project with Gradle
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
3+
4+
name: Publish package
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
10+
jobs:
11+
build:
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
with:
18+
path: './'
19+
fetch-depth: 0
20+
- name: Set up JDK 11
21+
uses: actions/setup-java@v1
22+
with:
23+
java-version: 11
24+
- name: Grant execute permission for gradlew
25+
run: chmod +x gradlew
26+
- name: Build with Gradle
27+
run: ./gradlew --no-daemon build
28+
- name: Upload to github
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
run: ./gradlew --no-daemon githubRelease

‎build.gradle.kts

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515
*/
1616

1717
import org.gradle.api.tasks.wrapper.Wrapper.DistributionType
18-
import com.jfrog.bintray.gradle.BintrayExtension
19-
import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
20-
import java.util.*
2118

2219
plugins {
2320
idea
2421
`java-library`
2522
`maven-publish`
2623

27-
id("com.jfrog.bintray") version "1.8.1"
24+
id("com.github.breadmoirai.github-release") version "2.2.12"
2825
}
2926

3027
project.group = "com.dunctebot"
31-
project.version = "1.4.0"
28+
project.version = "1.5.0"
3229
val archivesBaseName = "sourcemanagers"
3330

3431
repositories {
@@ -41,8 +38,8 @@ repositories {
4138

4239
dependencies {
4340
// build override for age-restricted videos
44-
implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
45-
// api(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.33")
41+
// implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
42+
implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.67")
4643
implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
4744

4845
implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
@@ -55,10 +52,9 @@ configure<JavaPluginConvention> {
5552

5653
tasks.withType<Wrapper> {
5754
distributionType = DistributionType.ALL
58-
gradleVersion = "5.6.3"
55+
gradleVersion = "6.8"
5956
}
6057

61-
val bintrayUpload: BintrayUploadTask by tasks
6258
val jar: Jar by tasks
6359
val build: Task by tasks
6460
val clean: Task by tasks
@@ -77,40 +73,50 @@ build.apply {
7773
sourcesJar.mustRunAfter(jar)
7874
}
7975

80-
bintrayUpload.apply {
81-
dependsOn(build)
82-
83-
onlyIf { System.getenv("BINTRAY_USER") != null }
84-
onlyIf { System.getenv("BINTRAY_KEY") != null }
85-
}
86-
8776
publishing {
8877
publications {
89-
register("BintrayRelease", MavenPublication::class) {
78+
create<MavenPublication>("mavenJava") {
79+
pom {
80+
name.set(archivesBaseName)
81+
description.set("Source managers for skybot")
82+
url.set("https://github.com/DuncteBot/skybot-source-managers")
83+
licenses {
84+
license {
85+
name.set("Apache-2.0")
86+
url.set("https://www.apache.org/licenses/LICENSE-2.0")
87+
}
88+
}
89+
developers {
90+
developer {
91+
id.set("duncte123")
92+
name.set("Duncan Sterken")
93+
email.set("contact@duncte123.me")
94+
}
95+
}
96+
scm {
97+
connection.set("scm:git:git://github.com/DuncteBot/skybot-source-managers.git")
98+
developerConnection.set("scm:git:ssh://git@github.com:DuncteBot/skybot-source-managers.git")
99+
url.set("https://github.com/DuncteBot/skybot-source-managers")
100+
}
101+
}
102+
90103
from(components["java"])
91-
artifact(sourcesJar)
92104

93105
artifactId = archivesBaseName
94106
groupId = project.group as String
95107
version = project.version as String
108+
109+
artifact(sourcesJar)
96110
}
97111
}
98112
}
99113

100-
bintray {
101-
user = System.getenv("BINTRAY_USER")
102-
key = System.getenv("BINTRAY_KEY")
103-
setPublications("BintrayRelease")
104-
pkg(delegateClosureOf<BintrayExtension.PackageConfig> {
105-
repo = "maven"
106-
name = "sourcemanagers"
107-
setLicenses("Apache-2.0")
108-
vcsUrl = "https://github.com/dunctebot/skybot-source-managers.git"
109-
publish = true
110-
version(delegateClosureOf<BintrayExtension.VersionConfig> {
111-
name = project.version as String
112-
released = Date().toString()
113-
})
114-
})
114+
githubRelease {
115+
token(System.getenv("GITHUB_TOKEN"))
116+
owner("DuncteBot")
117+
repo("skybot-source-managers")
118+
tagName(project.version as String)
119+
overwrite(false)
120+
prerelease(false)
121+
body(changelog())
115122
}
116-

‎gradle/wrapper/gradle-wrapper.jar

3.92 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
1-
#
2-
# Copyright 2020 Duncan "duncte123" Sterken
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
171
distributionBase=GRADLE_USER_HOME
182
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
204
zipStoreBase=GRADLE_USER_HOME
215
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172185
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)