Skip to content

Commit e7a5ecd

Browse files
Score2Score2
committed
The first round of testing is about to begin
1 parent 0468606 commit e7a5ecd

File tree

12 files changed

+153
-15
lines changed

12 files changed

+153
-15
lines changed

‎build.gradle.kts‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
kotlin("jvm") version "1.4.21" apply false
2+
kotlin("jvm") version "1.4.21"
33
id("org.jetbrains.dokka") version "1.4.10.2" apply false
44
id("org.jlleitschuh.gradle.ktlint") version "9.4.1" apply false
5-
id("com.github.johnrengelman.shadow") version "6.1.0" apply false
5+
id("com.github.johnrengelman.shadow") version "6.1.0"
66
id("net.kyori.blossom") version "1.1.0" apply false
77
id("maven")
88
id("maven-publish")
@@ -16,6 +16,32 @@ defaultTasks = mutableListOf("publishToMavenLocal")
1616

1717
extra.apply {
1818
set("commonsVersion", "2.0.3-SNAPSHOT")
19+
set("kotlinVersion", "1.4.21")
20+
}
21+
22+
repositories {
23+
mavenCentral()
24+
}
25+
26+
dependencies {
27+
implementation(project(":common"))
28+
implementation(project(":version-control:bukkit"))
29+
implementation(project(":version-control:bungee"))
30+
implementation(project(":version-control:sponge"))
31+
implementation(project(":version-control:velocity"))
32+
}
33+
34+
35+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
36+
dependencies {
37+
include(dependency(":common"))
38+
include(dependency(":version-control:bukkit"))
39+
include(dependency(":version-control:bungee"))
40+
include(dependency(":version-control:sponge"))
41+
include(dependency(":version-control:velocity"))
42+
}
43+
44+
classifier = null
1945
}
2046

2147
subprojects {

‎common/build.gradle.kts‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ repositories {
1111
}
1212

1313
dependencies {
14-
implementation(project(":common"))
15-
1614
compileOnly("org.apache.commons:commons-lang3:3.10")
1715
compileOnly("com.google.code.gson:gson:2.8.6")
1816
compileOnly("org.slf4j:slf4j-log4j12:1.7.30")
1917

20-
implementation("org.jetbrains.kotlin:kotlin-script-util:${KotlinVersion.CURRENT}")
21-
implementation("org.jetbrains.kotlin:kotlin-compiler:${KotlinVersion.CURRENT}")
18+
implementation("org.jetbrains.kotlin:kotlin-script-util:${rootProject.extra.get("kotlinVersion")}")
19+
implementation("org.jetbrains.kotlin:kotlin-compiler:${rootProject.extra.get("kotlinVersion")}")
2220
implementation("commons-cli:commons-cli:1.4")
2321

2422
implementation("commons-io:commons-io:2.7")
@@ -28,6 +26,25 @@ dependencies {
2826
implementation("me.scoretwo:commons-bukkit-configuration:${rootProject.extra.get("commonsVersion")}")
2927
}
3028

29+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
30+
dependencies {
31+
include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
32+
include(dependency("org.jetbrains.kotlin:kotlin-script-util:${rootProject.extra.get("kotlinVersion")}"))
33+
include(dependency("org.jetbrains.kotlin:kotlin-compiler:${rootProject.extra.get("kotlinVersion")}"))
34+
35+
include(dependency("commons-io:commons-io:2.7"))
36+
include(dependency("commons-cli:commons-cli:1.4"))
37+
38+
include(dependency("me.scoretwo:commons-syntaxes:${rootProject.extra.get("commonsVersion")}"))
39+
include(dependency("me.scoretwo:commons-command:${rootProject.extra.get("commonsVersion")}"))
40+
include(dependency("me.scoretwo:commons-server:${rootProject.extra.get("commonsVersion")}"))
41+
include(dependency("me.scoretwo:commons-bukkit-configuration:${rootProject.extra.get("commonsVersion")}"))
42+
}
43+
relocate("org.apache","me.scoretwo.utils.libs.org.apache")
44+
45+
classifier = null
46+
}
47+
3148
configure<PublishingExtension> {
3249
publications {
3350
create<MavenPublication>("shadow") {

‎common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/ExpansionManager.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ package me.scoretwo.fastscript.api.expansion
22

33
import me.scoretwo.fastscript.expansion.javascript.JavaScriptExpansion
44
import me.scoretwo.fastscript.expansion.kotlinscript.KotlinScriptExpansion
5+
import java.io.File
6+
import java.io.IOException
7+
import java.net.URLClassLoader
8+
import java.util.jar.JarEntry
9+
import java.util.jar.JarInputStream
510

611
class ExpansionManager {
712

‎version-control/bukkit/build.gradle.kts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,24 @@ configure<PublishingExtension> {
2828
}
2929
}
3030

31+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
32+
dependencies {
33+
include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
34+
35+
include(dependency("org.bstats:bstats-bukkit:1.7"))
36+
include(dependency("me.scoretwo:commons-bukkit-plugin:${rootProject.extra.get("commonsVersion")}"))
37+
}
38+
relocate("org.bstats","me.scoretwo.utils.libs.org.bstats")
39+
40+
classifier = null
41+
}
42+
3143
tasks.processResources {
3244
from("src/main/resource") {
3345
include("plugin.yml")
3446
expand(mapOf(
3547
"name" to rootProject.name,
36-
"main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.bukkit.BukkitPlugin",
48+
"main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.bukkit.BukkitBootStrap",
3749
"version" to rootProject.version,
3850
"description" to rootProject.description
3951
))

‎version-control/bukkit/src/main/resources/plugin.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: ${name}
22
version: ${version}
33
main: ${main}
4+
description: ${description}
45
authors:
56
- Score2
67
api-version: 1.13

‎version-control/bungee/build.gradle.kts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,22 @@ configure<PublishingExtension> {
2828
}
2929
}
3030

31+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
32+
dependencies {
33+
include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
34+
35+
include(dependency("me.scoretwo:commons-bungee-plugin:${rootProject.extra.get("commonsVersion")}"))
36+
}
37+
38+
classifier = null
39+
}
40+
3141
tasks.processResources {
3242
from("src/main/resource") {
3343
include("bungee.yml")
3444
expand(mapOf(
3545
"name" to project.name,
36-
"main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.bungee.BungeePlugin",
46+
"main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.bungee.BungeeBootStrap",
3747
"version" to project.version,
3848
"description" to project.description
3949
))

‎version-control/bungee/src/main/resources/bungee.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: ${name}
22
version: ${version}
33
main: ${main}
4+
description: ${description}
45
authors:
56
- Score2

‎version-control/sponge/build.gradle.kts‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ repositories {
1818

1919
blossom {
2020
replaceTokenIn("src/main/kotlin/me/scoretwo/fastscript/sponge/SpongeBootStrap.kt")
21-
replaceToken("%%version%%", rootProject.version)
22-
replaceToken("%%description%%", rootProject.description)
21+
replaceToken("%%id%%", project.name.toLowerCase())
22+
replaceToken("%%name%%", project.name)
23+
replaceToken("%%version%%", project.version)
24+
replaceToken("%%description%%", project.description)
2325
}
2426

2527
dependencies {
@@ -39,6 +41,28 @@ configure<PublishingExtension> {
3941
}
4042
}
4143

44+
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
45+
dependencies {
46+
include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
47+
48+
include(dependency("me.scoretwo:commons-bungee-plugin:${rootProject.extra.get("commonsVersion")}"))
49+
}
50+
51+
classifier = null
52+
}
53+
54+
tasks.processResources {
55+
from("src/main/resource") {
56+
include("mcmod.info")
57+
expand(mapOf(
58+
"id" to project.name.toLowerCase(),
59+
"name" to project.name,
60+
"version" to project.version,
61+
"description" to project.description
62+
))
63+
}
64+
}
65+
4266
/*
4367
tasks.processResources {
4468
from("src/main/resource") {

‎version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongeBootStrap.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import org.spongepowered.api.plugin.Plugin
1111
import org.spongepowered.api.plugin.PluginContainer
1212

1313
@Plugin(
14-
id = "fastscript",
15-
name = "FastScript",
14+
id = "%%id%%",
15+
name = "%%name%%",
1616
authors = ["Score2"],
1717
description = "%%description%%",
1818
dependencies = [Dependency(id = "placeholderapi", optional = true)],

‎version-control/sponge/src/main/resources/mcmod.info‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[
2+
{
3+
"modid": "${id}",
4+
"name": "${name}",
5+
"version": "${version}",
6+
"description": "${description}",
7+
"authorList": ["Score2"],
8+
}
9+
]

0 commit comments

Comments
 (0)