Skip to content

Commit d96c9a4

Browse files
committed
Updated essentials dependencies, build.gradle cleanup.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent f6fdd48 commit d96c9a4

2 files changed

Lines changed: 49 additions & 41 deletions

File tree

build.gradle

Lines changed: 31 additions & 26 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.kotlin:kotlin-serialization:$kotlinVersion"
20+
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
2121
)
2222
}
2323
}
@@ -27,34 +27,38 @@ apply(plugin: "kotlin")
2727
apply(plugin: "java")
2828
apply(plugin: "kotlinx-serialization")
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
minecraft {
3535
mappings(
36-
channel: mappingsChannelType,
37-
version: mappingsChannelVersion
36+
channel: forge_mappings_channel_type,
37+
version: forge_mappings_channel_version
3838
)
3939

4040
runs {
4141
client {
42-
workingDirectory(project.file(devRunClientPath))
42+
//noinspection GroovyAssignabilityCheck
43+
workingDirectory(project.file(dev_run_client_path))
4344
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
4445
property("forge.logging.console.level", "debug")
4546
mods {
4647
ProjectEssentialsChat {
48+
//noinspection GroovyAssignabilityCheck
4749
source(sourceSets.main)
4850
}
4951
}
5052
}
5153

5254
server {
53-
workingDirectory(project.file(devRunServerPath))
55+
//noinspection GroovyAssignabilityCheck
56+
workingDirectory(project.file(dev_run_server_path))
5457
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
5558
property("forge.logging.console.level", "debug")
5659
mods {
5760
ProjectEssentialsChat {
61+
//noinspection GroovyAssignabilityCheck
5862
source(sourceSets.main)
5963
}
6064
}
@@ -71,56 +75,57 @@ repositories {
7175
}
7276

7377
dependencies {
74-
minecraft(group: "net.minecraftforge", name: "forge", version: forgeBaseVersion)
75-
compile(group: "com.mojang", name: "brigadier", version: brigadierBaseVersion)
78+
minecraft(group: "net.minecraftforge", name: "forge", version: forge_version)
79+
compile(group: "com.mojang", name: "brigadier", version: brigadier_version)
7680
compile(
7781
group: "org.jetbrains.kotlinx",
7882
name: "kotlinx-serialization-runtime",
79-
version: kotlinxSerializationVersion
83+
version: kotlinx_serialization_version
8084
)
8185
compile(
8286
group: "org.jetbrains.kotlin",
83-
name: "kotlin-stdlib-$kotlinJdkVersionTarget",
84-
version: kotlinVersion
87+
name: "kotlin-stdlib-$kotlin_jdk_version_target",
88+
version: kotlin_version
8589
)
8690
compile(
8791
group: "com.github.projectessentials",
8892
name: "ProjectEssentials-Permissions",
89-
version: "v1.14.4-0.2.0.0"
93+
version: ess_perm_version
9094
)
9195
compile(
9296
group: "com.github.projectessentials",
9397
name: "ProjectEssentials-Core",
94-
version: "v1.14.4-1.+"
98+
version: ess_core_version
9599
)
96100
compile(
97101
group: "com.github.projectessentials",
98102
name: "ProjectEssentials-Cooldown",
99-
version: "v1.14.4-1.+"
103+
version: ess_cooldown_version
100104
)
101105
}
102106

103107
jar {
104108
manifest {
105109
attributes([
106-
"Specification-Title" : projectEssentialsName,
107-
"Specification-Vendor" : projectEssentialsVendor,
108-
"Specification-Version" : projectEssentialsVersion,
109-
"Implementation-Title" : projectEssentialsName,
110-
"Implementation-Version" : projectEssentialsVersion,
111-
"Implementation-Vendor" : projectEssentialsVendor,
110+
"Specification-Title" : module_name,
111+
"Specification-Vendor" : module_vendor,
112+
"Specification-Version" : module_version,
113+
"Implementation-Title" : module_name,
114+
"Implementation-Version" : module_version,
115+
"Implementation-Vendor" : module_vendor,
112116
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
113117
])
114118
}
115119
}
116120

117121
sourceCompatibility = targetCompatibility =
118122
compileJava.sourceCompatibility =
119-
compileJava.targetCompatibility = jvmVersionTarget
123+
compileJava.targetCompatibility = project_jvm_version_target
120124

121125
compileKotlin.kotlinOptions.jvmTarget =
122-
compileTestKotlin.kotlinOptions.jvmTarget = jvmVersionTarget
126+
compileTestKotlin.kotlinOptions.jvmTarget = project_jvm_version_target
123127

128+
//noinspection GroovyAssignabilityCheck
124129
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
125130
kotlinOptions {
126131
freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"

gradle.properties

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@ org.gradle.jvmargs=-Xmx3G
22
org.gradle.daemon=false
33
org.gradle.caching=true
44
kotlin.code.style=official
5-
devRunClientPath=run-client
6-
devRunServerPath=run-server
7-
forgeGradleVersion=3.+
8-
forgeBaseVersion=1.14.4-28.1.114
9-
brigadierBaseVersion=1.0.17
10-
mappingsChannelType=snapshot
11-
mappingsChannelVersion=20190719-1.14.3
12-
kotlinJdkVersionTarget=jdk8
13-
kotlinxSerializationVersion=0.14.0
14-
kotlinVersion=1.3.61
15-
projectEssentialsVersion=1.14.4-0.1.0.0
16-
projectEssentialsName=Project Essentials Chat
17-
projectEssentialsId=project_essentials_chat
18-
projectEssentialsVendor=MairwunNx (Pavel Erokhin)
19-
jvmVersionTarget=1.8
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+
ess_core_version=v1.14.4-1.+
17+
ess_perm_version=v1.14.4-0.+
18+
ess_cooldown_version=v1.14.4-1.+
19+
module_version=1.14.4-0.2.0.0
20+
module_name=Project Essentials Chat
21+
module_id=project_essentials_chat
22+
module_vendor=MairwunNx (Pavel Erokhin)

0 commit comments

Comments
 (0)