Skip to content

Commit a34ab7e

Browse files
committed
Improved build script.
Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>
1 parent e3da6af commit a34ab7e

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

build.gradle

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ 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.dokka:dokka-gradle-plugin:$dokkaVersion"
20+
"org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
2121
)
2222
}
2323
}
@@ -27,9 +27,9 @@ apply(plugin: "net.minecraftforge.gradle")
2727
apply(plugin: "kotlin")
2828
apply(plugin: "java")
2929

30-
version = projectEssentialsVersion
31-
group = "com.mairwunnx.$projectEssentialsId"
32-
archivesBaseName = projectEssentialsName
30+
version = module_version
31+
group = "com.mairwunnx.$module_id"
32+
archivesBaseName = module_name
3333

3434
configurations {
3535
embed
@@ -38,14 +38,14 @@ configurations {
3838

3939
minecraft {
4040
mappings(
41-
channel: mappingsChannelType,
42-
version: mappingsChannelVersion
41+
channel: forge_mappings_channel_type,
42+
version: forge_mappings_channel_version
4343
)
4444

4545
runs {
4646
client {
4747
//noinspection GroovyAssignabilityCheck
48-
workingDirectory(project.file(devRunClientPath))
48+
workingDirectory(project.file(dev_run_client_path))
4949
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
5050
property("forge.logging.console.level", "debug")
5151
mods {
@@ -58,7 +58,7 @@ minecraft {
5858

5959
server {
6060
//noinspection GroovyAssignabilityCheck
61-
workingDirectory(project.file(devRunServerPath))
61+
workingDirectory(project.file(dev_run_server_path))
6262
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
6363
property("forge.logging.console.level", "debug")
6464
mods {
@@ -79,27 +79,27 @@ repositories {
7979
}
8080

8181
dependencies {
82-
minecraft(group: "net.minecraftforge", name: "forge", version: forgeBaseVersion)
83-
compile(group: "com.mojang", name: "brigadier", version: brigadierBaseVersion)
82+
minecraft(group: "net.minecraftforge", name: "forge", version: forge_version)
83+
compile(group: "com.mojang", name: "brigadier", version: brigadier_version)
8484
compile(
8585
group: "org.jetbrains.kotlinx",
8686
name: "kotlinx-serialization-runtime",
87-
version: kotlinxSerializationVersion
87+
version: kotlinx_serialization_version
8888
)
8989
embed(
9090
group: "org.jetbrains.kotlinx",
9191
name: "kotlinx-serialization-runtime",
92-
version: kotlinxSerializationVersion
92+
version: kotlinx_serialization_version
9393
)
9494
compile(
9595
group: "org.jetbrains.kotlin",
96-
name: "kotlin-stdlib-$kotlinJdkVersionTarget",
97-
version: kotlinVersion
96+
name: "kotlin-stdlib-$kotlin_jdk_version_target",
97+
version: kotlin_version
9898
)
9999
embed(
100100
group: "org.jetbrains.kotlin",
101-
name: "kotlin-stdlib-$kotlinJdkVersionTarget",
102-
version: kotlinVersion
101+
name: "kotlin-stdlib-$kotlin_jdk_version_target",
102+
version: kotlin_version
103103
)
104104
}
105105

@@ -115,12 +115,12 @@ task modJar(type: Jar) {
115115
from configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }
116116
manifest {
117117
attributes([
118-
"Specification-Title" : projectEssentialsName,
119-
"Specification-Vendor" : projectEssentialsVendor,
120-
"Specification-Version" : projectEssentialsVersion,
121-
"Implementation-Title" : projectEssentialsName,
122-
"Implementation-Version" : projectEssentialsVersion,
123-
"Implementation-Vendor" : projectEssentialsVendor,
118+
"Specification-Title" : module_name,
119+
"Specification-Vendor" : module_version,
120+
"Specification-Version" : module_vendor,
121+
"Implementation-Title" : module_name,
122+
"Implementation-Version" : module_version,
123+
"Implementation-Vendor" : module_vendor,
124124
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
125125
])
126126
}
@@ -133,12 +133,12 @@ project.tasks["modJar"].dependsOn(project.tasks["jar"])
133133
jar {
134134
manifest {
135135
attributes([
136-
"Specification-Title" : projectEssentialsName,
137-
"Specification-Vendor" : projectEssentialsVendor,
138-
"Specification-Version" : projectEssentialsVersion,
139-
"Implementation-Title" : projectEssentialsName,
140-
"Implementation-Version" : projectEssentialsVersion,
141-
"Implementation-Vendor" : projectEssentialsVendor,
136+
"Specification-Title" : module_name,
137+
"Specification-Vendor" : module_vendor,
138+
"Specification-Version" : module_version,
139+
"Implementation-Title" : module_name,
140+
"Implementation-Version" : module_version,
141+
"Implementation-Vendor" : module_vendor,
142142
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
143143
])
144144
}
@@ -155,7 +155,7 @@ reobf {
155155

156156
sourceCompatibility = targetCompatibility =
157157
compileJava.sourceCompatibility =
158-
compileJava.targetCompatibility = jvmVersionTarget
158+
compileJava.targetCompatibility = project_jvm_version_target
159159

160160
compileKotlin.kotlinOptions.jvmTarget =
161-
compileTestKotlin.kotlinOptions.jvmTarget = jvmVersionTarget
161+
compileTestKotlin.kotlinOptions.jvmTarget = project_jvm_version_target

gradle.properties

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55
org.gradle.caching=true
66
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.14.0
16-
kotlinVersion=1.3.61
17-
projectEssentialsVersion=1.14.4-1.0.2.0
18-
projectEssentialsName=Project Essentials Core
19-
projectEssentialsId=project_essentials_core
20-
projectEssentialsVendor=MairwunNx (Pavel Erokhin)
21-
jvmVersionTarget=1.8
22-
dokkaVersion=0.9.18
7+
dev_run_client_path=run-client
8+
dev_run_server_path=run-server
9+
forge_gradle_version=3.+
10+
forge_version=1.14.4-28.1.114
11+
forge_mappings_channel_type=snapshot
12+
forge_mappings_channel_version=20190719-1.14.3
13+
brigadier_version=1.0.17
14+
kotlin_jdk_version_target=jdk8
15+
project_jvm_version_target=1.8
16+
kotlin_version=1.3.61
17+
kotlinx_serialization_version=0.14.0
18+
dokka_version=0.9.18
19+
module_version=1.14.4-1.0.2.0
20+
module_name=Project Essentials Core
21+
module_id=project_essentials_core
22+
module_vendor=MairwunNx (Pavel Erokhin)

0 commit comments

Comments
 (0)