From 612eef236172a5d0addd54aaafefa7b6bf227b56 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Mon, 26 Apr 2021 14:34:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BF=D0=B8=D1=87=D0=BD=D1=8B=D1=85=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=B2=20logic.gradle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 33 +--------------------------------
 logic.gradle | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 32 deletions(-)
 create mode 100644 logic.gradle

diff --git a/build.gradle b/build.gradle
index 9598373..bce7640 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,44 +5,13 @@
 
 import ru.dmitriymx.gradle.plugin.LibsPlugin
 
-class Logic {
-    private final Project project
-
-    Logic(Project project) {
-        this.project = project
-    }
-
-    String getProperty1(String propertyName1, String propertyName2) {
-        return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2))
-    }
-
-    String getProperty1(String propertyName) {
-        return (String) (project.hasProperty(propertyName) ? project.property(propertyName) : null)
-    }
-}
-
 plugins {
     id 'java'
     id 'application'
 }
 
 apply plugin: LibsPlugin
-
-def logic = new Logic(project)
-
-project.group = logic.getProperty1('project.group')
-project.version = logic.getProperty1('project.version')
-jar.archiveBaseName.set(logic.getProperty1('project.name'))
-
-compileJava {
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
-    options.encoding = 'UTF-8'
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
+apply from: rootDir.toPath().resolve('logic.gradle').toFile()
 
 dependencies {
     annotationProcessor libs.lombok
diff --git a/logic.gradle b/logic.gradle
new file mode 100644
index 0000000..0e9a252
--- /dev/null
+++ b/logic.gradle
@@ -0,0 +1,17 @@
+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')
+project.jar.archiveBaseName.set(getProperty1('module.name', 'project.name'))
+
+compileJava {
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
+    options.encoding = 'UTF-8'
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
\ No newline at end of file