BUG: field collision
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
project.group=mc-project
|
||||
project.name=mc-server
|
||||
project.version=1.1
|
||||
prj.group=mc-project
|
||||
prj.name=mc-server
|
||||
prj.version=1.1
|
||||
@@ -8,9 +8,9 @@ String getProperty1(String propertyName1, String propertyName2) {
|
||||
return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2))
|
||||
}
|
||||
|
||||
project.group = getProperty1('module.group', 'project.group')
|
||||
project.version = getProperty1('module.version', 'project.version')
|
||||
jar.archiveBaseName.set(getProperty1('module.name', 'project.name'))
|
||||
project.group = getProperty1('module.group', 'prj.group')
|
||||
project.version = getProperty1('module.version', 'prj.version')
|
||||
jar.archiveBaseName.set(getProperty1('module.name', 'prj.name'))
|
||||
|
||||
compileJava {
|
||||
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
|
||||
|
||||
@@ -8,7 +8,7 @@ rootProject.projectDir.toPath().resolve('gradle.properties').readLines().forEach
|
||||
})
|
||||
//endregion
|
||||
|
||||
rootProject.name = map.get('project.name')
|
||||
rootProject.name = map.get('prj.name')
|
||||
|
||||
include('utils')
|
||||
include('protocol-new')
|
||||
|
||||
Reference in New Issue
Block a user