Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent

plugins {
id("io.papermc.paperweight.patcher") version "2.0.0-beta.18"
id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
}

paperweight {
Expand Down
2 changes: 1 addition & 1 deletion forky-api/build.gradle.kts.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/fork-api/build.gradle.kts
+++ b/fork-api/build.gradle.kts
@@ -101,17 +_,21 @@
@@ -102,17 +_,21 @@
java {
srcDir(generatedDir)
srcDir(file("../paper-api/src/main/java"))
Expand Down
8 changes: 4 additions & 4 deletions forky-server/build.gradle.kts.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/fork-server/build.gradle.kts
+++ b/fork-server/build.gradle.kts
@@ -35,7 +_,22 @@
@@ -31,7 +_,22 @@
}
}

Expand All @@ -24,7 +24,7 @@

spigot {
enabled = true
@@ -122,10 +_,14 @@
@@ -119,10 +_,14 @@
main {
java { srcDir("../paper-server/src/main/java") }
resources { srcDir("../paper-server/src/main/resources") }
Expand All @@ -39,12 +39,12 @@
}
}

@@ -153,7 +_,7 @@
@@ -151,7 +_,7 @@
}

dependencies {
- implementation(project(":fork-api"))
+ implementation(project(":forky-api"))
implementation("ca.spottedleaf:concurrentutil:0.0.3")
implementation("ca.spottedleaf:concurrentutil:0.0.8")
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
group=fork.test
version=1.21.8-R0.1-SNAPSHOT
mcVersion=1.21.8
forkRef=c01a6baa00900afc11ec57d84bc6b82f58174790
version=1.21.11-R0.1-SNAPSHOT
apiVersion=1.21.11
mcVersion=1.21.11
forkRef=b8d7e6bddaf8596c042a3761aa892f21a6a7d3e9

org.gradle.configuration-cache=true
org.gradle.caching=true
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pluginManagement {
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}

rootProject.name = "forky"
Expand Down