Skip to content

Commit 3dc2769

Browse files
rework: simplify build script definitions across modules (#76)
* feat(ignore): add new ignore part * feat(gradle): add conventions plugin * chore(build): add convention plugin usage * chore(ignore): modernize file content * chore(settings): improve version catalog ordering * chore(deps): improve test dependency handling --------- Co-authored-by: theEvilReaper <theevilreaper@users.noreply.github.com>
1 parent f6344a0 commit 3dc2769

7 files changed

Lines changed: 47 additions & 76 deletions

File tree

.gitignore

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
1-
.gradle
1+
# Gradle & Kotlin
2+
.gradle/
23
build/
3-
!gradle/wrapper/gradle-wrapper.jar
4-
!**/src/main/**/build/
5-
!**/src/test/**/build/
4+
.kotlin/
65

7-
### IntelliJ IDEA ###
8-
.idea
6+
# IntelliJ IDEA
7+
.idea/
98
*.iws
109
*.iml
1110
*.ipr
1211
out/
13-
!**/src/main/**/out/
14-
!**/src/test/**/out/
1512

16-
### Eclipse ###
17-
.apt_generated
13+
# Eclipse
14+
.apt_generated/
1815
.classpath
1916
.factorypath
2017
.project
21-
.settings
18+
.settings/
2219
.springBeans
23-
.sts4-cache
20+
.sts4-cache/
2421
bin/
25-
!**/src/main/**/bin/
26-
!**/src/test/**/bin/
2722

28-
### NetBeans ###
23+
# NetBeans
2924
/nbproject/private/
3025
/nbbuild/
3126
/dist/
3227
/nbdist/
3328
/.nb-gradle/
3429

35-
### VS Code ###
30+
# VS Code
3631
.vscode/
3732

38-
### Mac OS ###
39-
.DS_Store
33+
# OS-spezifisch
34+
.DS_Store
35+
Thumbs.db

block/build.gradle.kts

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
plugins {
22
`java-library`
3-
}
4-
5-
group = "net.theevilreaper"
6-
version = "0.0.1"
7-
8-
java {
9-
toolchain {
10-
languageVersion.set(JavaLanguageVersion.of(25))
11-
}
3+
id("bounce.java-conventions")
124
}
135

146
dependencies {
@@ -22,13 +14,3 @@ dependencies {
2214
testImplementation(libs.junit.platform.launcher)
2315
testRuntimeOnly(libs.junit.engine)
2416
}
25-
26-
tasks {
27-
test {
28-
jvmArgs("-Dminestom.inside-test=true")
29-
useJUnitPlatform()
30-
testLogging {
31-
events("passed", "skipped", "failed")
32-
}
33-
}
34-
}

buildSrc/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import org.gradle.api.tasks.testing.Test
2+
3+
plugins {
4+
java
5+
}
6+
7+
group = "net.theevilreaper"
8+
version = "0.0.1"
9+
10+
java {
11+
toolchain {
12+
languageVersion.set(JavaLanguageVersion.of(25))
13+
}
14+
}
15+
16+
tasks.withType<Test>().configureEach {
17+
jvmArgs("-Dminestom.inside-test=true")
18+
useJUnitPlatform()
19+
testLogging {
20+
events("passed", "skipped", "failed")
21+
}
22+
}

common/build.gradle.kts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
plugins {
22
`java-library`
3-
}
4-
5-
group = "net.theevilreaper"
6-
version = "0.0.1"
7-
8-
java {
9-
toolchain {
10-
languageVersion.set(JavaLanguageVersion.of(25))
11-
}
3+
id("bounce.java-conventions")
124
}
135

146
dependencies {
@@ -26,14 +18,3 @@ dependencies {
2618
testImplementation(libs.junit.platform.launcher)
2719
testRuntimeOnly(libs.junit.engine)
2820
}
29-
30-
tasks {
31-
test {
32-
jvmArgs("-Dminestom.inside-test=true")
33-
useJUnitPlatform()
34-
testLogging {
35-
events("passed", "skipped", "failed")
36-
}
37-
}
38-
}
39-

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ dependencyResolutionManagement {
2727
version("shadow", "9.4.2")
2828
version("aonyx", "0.7.1")
2929
version("pvp", "2026.05.30-26.1.1")
30+
version("cloudnet", "4.0.0-RC17-SNAPSHOT")
3031

3132
library("aonyx.bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx")
32-
version("cloudnet", "4.0.0-RC17-SNAPSHOT")
3333

3434
library("pvp", "io.github.togar2", "MinestomPvP").versionRef("pvp")
3535
library("minestom", "net.minestom", "minestom").withoutVersion()

setup/build.gradle.kts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
plugins {
2-
java
32
`maven-publish`
43
application
54
alias(libs.plugins.shadow)
5+
id("bounce.java-conventions")
66
}
77

8-
group = "net.theevilreaper"
9-
version = "0.0.1"
108
description = "Bounce Setup Server"
119

1210
dependencies {
@@ -35,23 +33,8 @@ application {
3533
mainClass.set("net.theevilreaper.bounce.BounceSetupServer")
3634
}
3735

38-
java {
39-
toolchain {
40-
languageVersion.set(JavaLanguageVersion.of(25))
41-
}
42-
}
43-
4436
tasks {
4537
jar {
4638
dependsOn("shadowJar")
4739
}
48-
49-
test {
50-
jvmArgs("-Dminestom.inside-test=true")
51-
useJUnitPlatform()
52-
testLogging {
53-
events("passed", "skipped", "failed")
54-
}
55-
}
5640
}
57-

0 commit comments

Comments
 (0)