Skip to content

Commit 930c3bd

Browse files
committed
Kotlin and KotlinX Serialization updated.
All essentials dependencies updated. Variable naming in gradle.properties improved. Version number updated. Signed-off-by: Pavel Erokhin (MairwunNx) <[email protected]>
1 parent f7b61ae commit 930c3bd

File tree

2 files changed

+48
-49
lines changed

2 files changed

+48
-49
lines changed

build.gradle

Lines changed: 30 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.kotlin:kotlin-serialization:$kotlinVersion"
20+
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
2121
)
2222
}
2323
}
@@ -26,34 +26,38 @@ apply(plugin: "net.minecraftforge.gradle")
2626
apply(plugin: "kotlin")
2727
apply(plugin: "kotlinx-serialization")
2828

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

3333
minecraft {
3434
mappings(
35-
channel: mappingsChannelType,
36-
version: mappingsChannelVersion
35+
channel: forge_mappings_channel_type,
36+
version: forge_mappings_channel_version
3737
)
3838

3939
runs {
4040
client {
41-
workingDirectory(project.file(devRunClientPath))
41+
//noinspection GroovyAssignabilityCheck
42+
workingDirectory(project.file(dev_run_client_path))
4243
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
4344
property("forge.logging.console.level", "debug")
4445
mods {
4546
ProjectEssentialsSpawn {
47+
//noinspection GroovyAssignabilityCheck
4648
source(sourceSets.main)
4749
}
4850
}
4951
}
5052

5153
server {
52-
workingDirectory(project.file(devRunServerPath))
54+
//noinspection GroovyAssignabilityCheck
55+
workingDirectory(project.file(dev_run_server_path))
5356
property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP")
5457
property("forge.logging.console.level", "debug")
5558
mods {
5659
ProjectEssentialsSpawn {
60+
//noinspection GroovyAssignabilityCheck
5761
source(sourceSets.main)
5862
}
5963
}
@@ -70,58 +74,52 @@ repositories {
7074
}
7175

7276
dependencies {
73-
minecraft(group: "net.minecraftforge", name: "forge", version: forgeBaseVersion)
74-
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)
7579
compile(
7680
group: "org.jetbrains.kotlinx",
7781
name: "kotlinx-serialization-runtime",
78-
version: kotlinxSerializationVersion
82+
version: kotlinx_serialization_version
7983
)
8084
compile(
8185
group: "org.jetbrains.kotlin",
82-
name: "kotlin-stdlib-$kotlinJdkVersionTarget",
83-
version: kotlinVersion
86+
name: "kotlin-stdlib-$kotlin_jdk_version_target",
87+
version: kotlin_version
8488
)
8589
compile(
8690
group: "com.github.projectessentials",
8791
name: "ProjectEssentials-Permissions",
88-
version: "v1.14.4-0.2.0.0"
92+
version: ess_perm_version
8993
)
9094
compile(
9195
group: "com.github.projectessentials",
9296
name: "ProjectEssentials-Core",
93-
version: "v1.14.4-1.+"
97+
version: ess_core_version
9498
)
9599
compile(
96100
group: "com.github.projectessentials",
97101
name: "ProjectEssentials-Cooldown",
98-
version: "v1.14.4-1.+"
102+
version: ess_cooldown_version
99103
)
100104
}
101105

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

116120
sourceCompatibility = targetCompatibility =
117121
compileJava.sourceCompatibility =
118-
compileJava.targetCompatibility = jvmVersionTarget
122+
compileJava.targetCompatibility = project_jvm_version_target
119123

120124
compileKotlin.kotlinOptions.jvmTarget =
121-
compileTestKotlin.kotlinOptions.jvmTarget = jvmVersionTarget
122-
123-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
124-
kotlinOptions {
125-
freeCompilerArgs += "-Xuse-experimental=kotlin.Experimental"
126-
}
127-
}
125+
compileTestKotlin.kotlinOptions.jvmTarget = project_jvm_version_target

gradle.properties

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +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.0.73
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.1.0.0
18-
projectEssentialsName=Project Essentials Spawn
19-
projectEssentialsId=project_essentials_spawn
20-
projectEssentialsVendor=MairwunNx (Pavel Erokhin)
21-
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.1.+
17+
ess_perm_version=v1.14.4-1.1.+
18+
ess_cooldown_version=v1.14.4-1.0.+
19+
module_version=1.14.4-1.1.1
20+
module_name=Project Essentials Spawn
21+
module_id=project_essentials_spawn
22+
module_vendor=MairwunNx (Pavel Erokhin)

0 commit comments

Comments
 (0)