Skip to content

Commit 4e432e9

Browse files
DerEchtePilzDerEchtePilz
committed
Setup buildSrc
1 parent 74134e4 commit 4e432e9

File tree

8 files changed

+101
-106
lines changed

8 files changed

+101
-106
lines changed

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ reference-code.iml
88
reference-code/reference-code.iml
99
reference-code/target
1010
reference-code/build
11-
reference-code/.kotlin
12-
reference-code/.gradle
11+
reference-code/**/build
12+
**/.kotlin
13+
**/.gradle
1314

1415
package-lock.json
1516
.vscode

‎reference-code/buildSrc/build.gradle.kts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
gradlePluginPortal()
8+
}
9+
10+
dependencies {
11+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
12+
}

‎reference-code/buildSrc/settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "buildSrc"

‎reference-code/buildSrc/src/main/kotlin/common.gradle.kts‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3+
4+
plugins {
5+
`java-library`
6+
kotlin("jvm")
7+
}
8+
9+
java.sourceCompatibility = JavaVersion.VERSION_21
10+
java.targetCompatibility = JavaVersion.VERSION_21
11+
12+
val commandApiVersion: String by project
13+
val paperVersion: String by project
14+
val velocityVersion: String by project
15+
val brigadierVersion: String by project
16+
val authlibVersion: String by project
17+
val nbtApiVersion: String by project
18+
val kotlinVersion: String by project
19+
val junitVersion: String by project
20+
val mockBukkitVersion: String by project
21+
22+
repositories {
23+
mavenLocal()
24+
maven {
25+
url = uri("https://libraries.minecraft.net")
26+
}
27+
28+
maven {
29+
url = uri("https://repo.papermc.io/repository/maven-public/")
30+
}
31+
32+
maven {
33+
url = uri("https://repo.codemc.org/repository/maven-public/")
34+
}
35+
36+
maven {
37+
url = uri("https://central.sonatype.com/repository/maven-snapshots/")
38+
}
39+
40+
maven {
41+
url = uri("https://repo.maven.apache.org/maven2/")
42+
}
43+
}
44+
45+
dependencies {
46+
api("dev.jorel:commandapi-bukkit-core:$commandApiVersion")
47+
api("dev.jorel:commandapi-paper-core:$commandApiVersion")
48+
api("dev.jorel:commandapi-spigot-core:$commandApiVersion")
49+
api("dev.jorel:commandapi-kotlin-bukkit:$commandApiVersion")
50+
api("dev.jorel:commandapi-annotations:$commandApiVersion")
51+
compileOnly("dev.jorel:commandapi-velocity-shade:$commandApiVersion")
52+
api("de.tr7zw:item-nbt-api:$nbtApiVersion")
53+
api("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
54+
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
55+
//testImplementation(libs.dev.jorel.commandapi.bukkit.test.toolkit)
56+
testImplementation("com.github.seeseemelk:MockBukkit-v1.21:$mockBukkitVersion")
57+
compileOnly("com.mojang:brigadier:$brigadierVersion")
58+
compileOnly("com.mojang:authlib:$authlibVersion")
59+
compileOnly("io.papermc.paper:paper-api:$paperVersion")
60+
compileOnly("com.velocitypowered:velocity-api:$velocityVersion")
61+
}
62+
63+
tasks.withType<JavaCompile> {
64+
options.encoding = "UTF-8"
65+
}
66+
67+
tasks.withType<Javadoc> {
68+
options.encoding = "UTF-8"
69+
}
70+
71+
tasks.withType<KotlinCompile> {
72+
compilerOptions.jvmTarget = JvmTarget.JVM_21
73+
}

‎reference-code/bukkit/build.gradle.kts‎

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,7 @@
1-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3-
41
plugins {
5-
`java-library`
6-
kotlin("jvm") version "2.1.0"
2+
common
73
}
84

95
group = "dev.jorel.commandapi"
106
version = "1.0-SNAPSHOT"
11-
description = "reference-code-bukkit"
12-
13-
repositories {
14-
mavenLocal()
15-
maven {
16-
url = uri("https://libraries.minecraft.net")
17-
}
18-
19-
maven {
20-
url = uri("https://repo.papermc.io/repository/maven-public/")
21-
}
22-
23-
maven {
24-
url = uri("https://repo.codemc.org/repository/maven-public/")
25-
}
26-
27-
maven {
28-
url = uri("https://central.sonatype.com/repository/maven-snapshots/")
29-
}
30-
31-
maven {
32-
url = uri("https://repo.maven.apache.org/maven2/")
33-
}
34-
}
35-
36-
dependencies {
37-
api(libs.net.kyori.adventure.platform.bukkit)
38-
api(libs.dev.jorel.commandapi.bukkit.core)
39-
api(libs.dev.jorel.commandapi.paper.core)
40-
api(libs.dev.jorel.commandapi.spigot.core)
41-
api(libs.dev.jorel.commandapi.kotlin.bukkit)
42-
api(libs.dev.jorel.commandapi.annotations)
43-
compileOnly(libs.dev.jorel.commandapi.velocity.shade)
44-
api(libs.de.tr7zw.item.nbt.api)
45-
api(libs.org.jetbrains.kotlin.kotlin.stdlib)
46-
testImplementation(libs.org.junit.jupiter.junit.jupiter)
47-
//testImplementation(libs.dev.jorel.commandapi.bukkit.test.toolkit)
48-
testImplementation(libs.com.github.seeseemelk.mockbukkit.v1.v21)
49-
compileOnly(libs.com.mojang.brigadier)
50-
compileOnly(libs.com.mojang.authlib)
51-
compileOnly(libs.io.papermc.paper.paper.api)
52-
compileOnly(libs.com.velocitypowered.velocity.api)
53-
}
54-
55-
group = "dev.jorel.commandapi"
56-
version = "1.0-SNAPSHOT"
57-
java.sourceCompatibility = JavaVersion.VERSION_21
58-
java.targetCompatibility = JavaVersion.VERSION_21
59-
60-
tasks.withType<JavaCompile> {
61-
options.encoding = "UTF-8"
62-
}
63-
64-
tasks.withType<Javadoc> {
65-
options.encoding = "UTF-8"
66-
}
67-
68-
tasks.withType<KotlinCompile> {
69-
compilerOptions.jvmTarget = JvmTarget.JVM_21
70-
}
7+
description = "reference-code-bukkit"

‎reference-code/gradle.properties‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
commandApiVersion=11.0.0-SNAPSHOT
2+
paperVersion=1.20.6-R0.1-SNAPSHOT
3+
velocityVersion=3.4.0-SNAPSHOT
4+
brigadierVersion=1.0.17
5+
authlibVersion=3.3.39
6+
nbtApiVersion=2.11.1
7+
kotlinVersion=2.0.0
8+
junitVersion=5.11.0
9+
mockBukkitVersion=3.133.2

‎reference-code/gradle/libs.versions.toml‎

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

‎update.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ echo "New version:"
55
read -r newVer
66

77
# Update CommandAPI dependency versions
8-
sed -i "s/dev-jorel-commandapi-annotations = \"$oldVer\"/dev-jorel-commandapi-annotations = \"$newVer\"/" reference-code/gradle/libs.versions.toml
9-
sed -i "s/dev-jorel-commandapi-bukkit-core = \"$oldVer\"/dev-jorel-commandapi-bukkit-core = \"$newVer\"/" reference-code/gradle/libs.versions.toml
10-
sed -i "s/dev-jorel-commandapi-bukkit-kotlin = \"$oldVer\"/dev-jorel-commandapi-bukkit-kotlin = \"$newVer\"/" reference-code/gradle/libs.versions.toml
11-
sed -i "s/dev-jorel-commandapi-bukkit-test-toolkit = \"$oldVer\"/dev-jorel-commandapi-bukkit-test-toolkit = \"$newVer\"/" reference-code/gradle/libs.versions.toml
12-
sed -i "s/dev-jorel-commandapi-velocity-shade = \"$oldVer\"/dev-jorel-commandapi-velocity-shade = \"$newVer\"/" reference-code/gradle/libs.versions.toml
8+
sed -i "s/commandApiVersion=\"$oldVer\"/commandApiVersion\"$newVer\"/" reference-code/gradle.properties
139

1410
# Update CommandAPI version in documentation files (Maven)
1511
sed -i "s/<version>$oldVer<\/version>/<version>$newVer<\/version>/" docs/en/dev-setup/annotations.md

0 commit comments

Comments
 (0)