Skip to content

Commit 28dd397

Browse files
committed
Update Gradle to 8.10.2
- Remove JCenter as it no longer exists
1 parent 60673cc commit 28dd397

File tree

10 files changed

+35
-30
lines changed

10 files changed

+35
-30
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ jobs:
77
run:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
11-
- uses: actions/setup-java@v3
10+
- uses: actions/checkout@v4
11+
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'temurin'
1414
java-version: '17'
1515
- name: Setup Gradle
16-
uses: gradle/gradle-build-action@v2
16+
uses: gradle/actions/setup-gradle@v4
1717
- name: Compile Plugin and check example
1818
working-directory: example
1919
# building the example also builds the plugin
@@ -31,4 +31,4 @@ jobs:
3131
run: ./gradlew publish publishPlugins
3232
- name: Release
3333
if: startsWith(github.ref, 'refs/tags/')
34-
uses: softprops/action-gh-release@v1
34+
uses: softprops/action-gh-release@v2

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "dev.arbjerg"
8-
version = "1.0.18"
8+
version = "1.0.19"
99

1010
repositories {
1111
mavenCentral()

example/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ version = "1.0.0"
99
dependencies {
1010
// Only here to test dependency handling
1111
// And Kotlin is best dependency <3
12-
implementation(kotlin("stdlib", "1.9.21"))
13-
implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.6.2")
12+
implementation(kotlin("stdlib", "2.0.21"))
13+
implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.7.3")
1414
}
1515

1616
java {
@@ -20,6 +20,6 @@ java {
2020
}
2121

2222
lavalinkPlugin {
23-
apiVersion = "4.0.0"
24-
serverVersion = "4.0.0"
23+
apiVersion = "4.0.8"
24+
serverVersion = "4.0.8"
2525
}

example/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[plugins]
2-
gradle-publish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
2+
gradle-publish = { id = "com.gradle.plugin-publish", version = "1.3.0" }

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

src/main/kotlin/LavalinkGradlePlugin.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.api.artifacts.Dependency
77
import org.gradle.api.artifacts.ProjectDependency
8+
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
89
import org.gradle.api.provider.Provider
910
import org.gradle.api.publish.PublishingExtension
1011
import org.gradle.api.publish.maven.MavenPublication
@@ -53,9 +54,7 @@ private fun Project.configureDependencies(): Provider<Dependency> {
5354
// Required for runtime
5455
maven("https://maven.lavalink.dev/releases")
5556
maven("https://maven.lavalink.dev/snapshots")
56-
// Required for Lavalink Dependencies
57-
@Suppress("DEPRECATION")
58-
jcenter()
57+
5958
}
6059

6160
dependencies {
@@ -104,9 +103,10 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
104103

105104
val jar = named<Jar>("jar") {
106105
configurations.getByName("runtimeClasspath")
107-
.fileCollection {
108-
it !is ProjectDependency
109-
}
106+
.incoming
107+
.artifactView {
108+
componentFilter { it is ProjectComponentIdentifier }
109+
}.artifacts
110110
.forEach {
111111
from(zipTree(it)) {
112112
exclude("META-INF/**")

0 commit comments

Comments
 (0)