Minecraft/mc-server
Archived
0
Fork 0
Code Releases Activity

BUG: field collision

Browse Source
This commit is contained in:
DmitriyMX
2021-06-13 14:33:18 +03:00
parent 95474a32c4
commit e76f7ff375
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@@ -1,3 +1,3 @@
project.group=mc-project prj.group=mc-project
project.name=mc-server prj.name=mc-server
project.version=1.1 prj.version=1.1

6
logic.gradle
View File

@@ -8,9 +8,9 @@ String getProperty1(String propertyName1, String propertyName2) {
return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2)) return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2))
} }
project.group = getProperty1('module.group', 'project.group') project.group = getProperty1('module.group', 'prj.group')
project.version = getProperty1('module.version', 'project.version') project.version = getProperty1('module.version', 'prj.version')
jar.archiveBaseName.set(getProperty1('module.name', 'project.name')) jar.archiveBaseName.set(getProperty1('module.name', 'prj.name'))
compileJava { compileJava {
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11

2
settings.gradle
View File

@@ -8,7 +8,7 @@ rootProject.projectDir.toPath().resolve('gradle.properties').readLines().forEach
}) })
//endregion //endregion
rootProject.name = map.get('project.name') rootProject.name = map.get('prj.name')
include('utils') include('utils')
include('protocol-new') include('protocol-new')