From e76f7ff3759f2f090f78251dcbe2b0f8e7954c96 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 13 Jun 2021 14:33:18 +0300
Subject: [PATCH] BUG: field collision

---
 gradle.properties | 6 +++---
 logic.gradle      | 6 +++---
 settings.gradle   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8a47122..c37b34d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-project.group=mc-project
-project.name=mc-server
-project.version=1.1
\ No newline at end of file
+prj.group=mc-project
+prj.name=mc-server
+prj.version=1.1
\ No newline at end of file
diff --git a/logic.gradle b/logic.gradle
index 16f5e97..d00218d 100644
--- a/logic.gradle
+++ b/logic.gradle
@@ -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
diff --git a/settings.gradle b/settings.gradle
index 0257633..d6b1f20 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -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')