diff --git a/build.gradle.kts b/build.gradle.kts
index efdcb2a97..51ac593b1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,17 +34,12 @@ toothpick {
subprojects {
repositories {
- mavenCentral()
- maven("https://repo.aikar.co/content/groups/aikar/")
maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
- maven("https://libraries.minecraft.net")
- mavenLocal()
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
- withSourcesJar()
+ sourceCompatibility = JavaVersion.toVersion(8)
+ targetCompatibility = JavaVersion.toVersion(8)
}
publishing.repositories.maven {
diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch
index 6448decee..2c3930a0a 100644
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/pom.xml b/pom.xml
-index fc2c3714b6c772d67e258be269aa92dda80cdb12..cf6e53e9f483d21b17e2782816be4403fa5be717 100644
+index fc2c3714b6c772d67e258be269aa92dda80cdb12..3719e044d0e02c306723e680677e7dbed1b0f242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,10 @@
@@ -21,6 +21,28 @@ index fc2c3714b6c772d67e258be269aa92dda80cdb12..cf6e53e9f483d21b17e2782816be4403
${project.version}
compile
+@@ -353,8 +355,20 @@
+
+ org.eclipse.jdt
+ ecj
+- 3.24.0
++
++ 3.25.0
+
++
++ org.jetbrains.kotlin
++ kotlin-stdlib
++ 1.4.32
++
++
++ org.jetbrains.kotlin
++ kotlin-reflect
++ 1.4.32
++
++
+
+
+
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index 89eeb9d202405747409e65fcf226d95379987e29..4d9e685c691a37078ff7452e50ab8c13999dbe10 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c8a57b32..8869843a3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,11 +14,11 @@ val forkNameLowercase = forkName.toLowerCase(Locale.ENGLISH)
rootProject.name = forkNameLowercase
setupSubproject("$forkNameLowercase-api") {
- projectDir = File("$forkName-API")
+ projectDir = file("$forkName-API")
buildFileName = "../subprojects/api.gradle.kts"
}
setupSubproject("$forkNameLowercase-server") {
- projectDir = File("$forkName-Server")
+ projectDir = file("$forkName-Server")
buildFileName = "../subprojects/server.gradle.kts"
}
diff --git a/subprojects/api.gradle.kts b/subprojects/api.gradle.kts
index 2578822b7..e69de29bb 100644
--- a/subprojects/api.gradle.kts
+++ b/subprojects/api.gradle.kts
@@ -1,14 +0,0 @@
-import xyz.jpenilla.toothpick.loadDependencies
-import xyz.jpenilla.toothpick.loadRepositories
-
-repositories {
- loadRepositories(project)
-}
-
-dependencies {
- loadDependencies(project)
-}
-
-java {
- withJavadocJar()
-}
diff --git a/subprojects/server.gradle.kts b/subprojects/server.gradle.kts
index ea5367247..b4aebc9ec 100644
--- a/subprojects/server.gradle.kts
+++ b/subprojects/server.gradle.kts
@@ -1,11 +1,3 @@
-import xyz.jpenilla.toothpick.loadDependencies
-import xyz.jpenilla.toothpick.loadRepositories
-
-repositories {
- loadRepositories(project)
-}
-
dependencies {
- loadDependencies(project)
implementation("cat.inspiracio", "rhino-js-engine", "1.7.7.1")
}