From 39b858696f37e5db31fc5c76297d3bc835f8e1ba Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Mon, 26 Apr 2021 14:00:19 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20Lo?=
 =?UTF-8?q?gicPlugin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  | 20 +++++++++++++++++--
 .../gradle/extention/LogicExtention.java      | 19 ------------------
 .../dmitriymx/gradle/plugin/LogicPlugin.java  | 13 ------------
 3 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java
 delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java

diff --git a/build.gradle b/build.gradle
index 7de1955..9598373 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,22 @@
  */
 
 import ru.dmitriymx.gradle.plugin.LibsPlugin
-import ru.dmitriymx.gradle.plugin.LogicPlugin
+
+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'
@@ -12,7 +27,8 @@ plugins {
 }
 
 apply plugin: LibsPlugin
-apply plugin: LogicPlugin
+
+def logic = new Logic(project)
 
 project.group = logic.getProperty1('project.group')
 project.version = logic.getProperty1('project.version')
diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java
deleted file mode 100644
index c596a13..0000000
--- a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LogicExtention.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ru.dmitriymx.gradle.extention;
-
-import org.gradle.api.Project;
-
-public class LogicExtention {
-	private final Project project;
-
-	public LogicExtention(Project project) {
-		this.project = project;
-	}
-
-	public String getProperty1(String propertyName1, String propertyName2) {
-		return (String) (project.hasProperty(propertyName1) ? project.property(propertyName1) : project.property(propertyName2));
-	}
-
-	public String getProperty1(String propertyName) {
-		return (String) (project.hasProperty(propertyName) ? project.property(propertyName) : null);
-	}
-}
diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java
deleted file mode 100644
index 4068cf4..0000000
--- a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LogicPlugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ru.dmitriymx.gradle.plugin;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import ru.dmitriymx.gradle.extention.LogicExtention;
-
-public class LogicPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getExtensions().create("logic", LogicExtention.class, project);
-	}
-}