Skip to content

Commit 3a3e8f7

Browse files
committed
Gradle file cleanup.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent 12e07e5 commit 3a3e8f7

2 files changed

Lines changed: 44 additions & 44 deletions

File tree

build.gradle

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ buildscript {
1010
classpath(
1111
group: "net.minecraftforge.gradle",
1212
name: "ForgeGradle",
13-
version: forgeGradleVersion,
13+
version: forge_gradle_version,
1414
changing: true
1515
)
1616
classpath(
17-
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
17+
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1818
)
1919
classpath(
20-
"org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
20+
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
2121
)
2222
classpath(
23-
"org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
23+
"org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
2424
)
2525
}
2626
}
@@ -30,19 +30,19 @@ apply(plugin: "net.minecraftforge.gradle")
3030
apply(plugin: "kotlin")
3131
apply(plugin: "kotlinx-serialization")
3232

33-
version = projectEssentialsVersion
34-
group = "com.mairwunnx.$projectEssentialsId"
35-
archivesBaseName = projectEssentialsName
33+
version = module_version
34+
group = "com.mairwunnx.$module_id"
35+
archivesBaseName = module_name
3636

3737
minecraft {
3838
mappings(
39-
channel: mappingsChannelType,
40-
version: mappingsChannelVersion
39+
channel: forge_mappings_channel_type,
40+
version: forge_mappings_channel_version
4141
)
4242

4343
runs {
4444
client {
45-
workingDirectory(project.file(devRunClientPath))
45+
workingDirectory(project.file(dev_run_client_path))
4646
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
4747
property("forge.logging.console.level", "debug")
4848
mods {
@@ -53,7 +53,7 @@ minecraft {
5353
}
5454

5555
server {
56-
workingDirectory(project.file(devRunServerPath))
56+
workingDirectory(project.file(dev_run_server_path))
5757
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
5858
property("forge.logging.console.level", "debug")
5959
mods {
@@ -74,27 +74,27 @@ repositories {
7474
}
7575

7676
dependencies {
77-
minecraft(group: "net.minecraftforge", name: "forge", version: forgeBaseVersion)
78-
compile(group: "com.mojang", name: "brigadier", version: brigadierBaseVersion)
77+
minecraft(group: "net.minecraftforge", name: "forge", version: forge_version)
78+
compile(group: "com.mojang", name: "brigadier", version: brigadier_version)
7979
compile(
8080
group: "org.jetbrains.kotlinx",
8181
name: "kotlinx-serialization-runtime",
82-
version: kotlinxSerializationVersion
82+
version: kotlinx_serialization_version
8383
)
8484
compile(
8585
group: "org.jetbrains.kotlin",
86-
name: "kotlin-stdlib-$kotlinJdkVersionTarget",
87-
version: kotlinVersion
86+
name: "kotlin-stdlib-$kotlin_jdk_version_target",
87+
version: kotlin_version
8888
)
8989
compile(
9090
group: "com.github.projectessentials",
9191
name: "ProjectEssentials-Core",
92-
version: "v1.14.4-1.+"
92+
version: ess_core_version
9393
)
9494
compile(
9595
group: "com.github.projectessentials",
9696
name: "ProjectEssentials-Permissions",
97-
version: "v1.14.4-1.+"
97+
version: ess_permissions_version
9898
)
9999
}
100100

@@ -108,23 +108,23 @@ project.tasks["jar"].dependsOn(project.tasks["dokka"])
108108
jar {
109109
manifest {
110110
attributes([
111-
"Specification-Title" : projectEssentialsName,
112-
"Specification-Vendor" : projectEssentialsVendor,
113-
"Specification-Version" : projectEssentialsVersion,
114-
"Implementation-Title" : projectEssentialsName,
115-
"Implementation-Version" : projectEssentialsVersion,
116-
"Implementation-Vendor" : projectEssentialsVendor,
111+
"Specification-Title" : module_name,
112+
"Specification-Vendor" : module_vendor,
113+
"Specification-Version" : module_version,
114+
"Implementation-Title" : module_name,
115+
"Implementation-Version" : module_version,
116+
"Implementation-Vendor" : module_vendor,
117117
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
118118
])
119119
}
120120
}
121121

122122
sourceCompatibility = targetCompatibility =
123123
compileJava.sourceCompatibility =
124-
compileJava.targetCompatibility = jvmVersionTarget
124+
compileJava.targetCompatibility = project_jvm_version_target
125125

126126
compileKotlin.kotlinOptions.jvmTarget =
127-
compileTestKotlin.kotlinOptions.jvmTarget = jvmVersionTarget
127+
compileTestKotlin.kotlinOptions.jvmTarget = project_jvm_version_target
128128

129129
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
130130
kotlinOptions {

gradle.properties

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
2-
# This is required to provide enough memory for the Minecraft decompilation process.
31
org.gradle.jvmargs=-Xmx3G
42
org.gradle.daemon=false
53
org.gradle.caching=true
64
kotlin.code.style=official
7-
devRunClientPath=run-client
8-
devRunServerPath=run-server
9-
forgeGradleVersion=3.+
10-
forgeBaseVersion=1.14.4-28.1.114
11-
brigadierBaseVersion=1.0.17
12-
mappingsChannelType=snapshot
13-
mappingsChannelVersion=20190719-1.14.3
14-
kotlinJdkVersionTarget=jdk8
15-
kotlinxSerializationVersion=0.12.0
16-
kotlinVersion=1.3.50
17-
projectEssentialsVersion=1.14.4-1.0.1.0
18-
projectEssentialsName=Project Essentials Cooldown
19-
projectEssentialsId=project_essentials_cooldown
20-
projectEssentialsVendor=MairwunNx (Pavel Erokhin)
21-
jvmVersionTarget=1.8
22-
dokkaVersion=0.9.18
5+
dev_run_client_path=run-client
6+
dev_run_server_path=run-server
7+
forge_gradle_version=3.+
8+
forge_version=1.14.4-28.1.114
9+
forge_mappings_channel_type=snapshot
10+
forge_mappings_channel_version=20190719-1.14.3
11+
brigadier_version=1.0.17
12+
kotlin_jdk_version_target=jdk8
13+
project_jvm_version_target=1.8
14+
kotlin_version=1.3.61
15+
kotlinx_serialization_version=0.14.0
16+
dokka_version=0.10.0
17+
ess_core_version=v1.14.4-1.+
18+
ess_permissions_version=v1.14.4-1.+
19+
module_version=1.14.4-1.0.2.0
20+
module_name=Project Essentials Cooldown
21+
module_id=project_essentials_cooldown
22+
module_vendor=MairwunNx (Pavel Erokhin)

0 commit comments

Comments
 (0)