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

---
 build.gradle                                  | 36 +++++++++++++--
 .../gradle/extention/LibsExtention.java       | 46 -------------------
 .../dmitriymx/gradle/plugin/LibsPlugin.java   | 13 ------
 3 files changed, 33 insertions(+), 62 deletions(-)
 delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java
 delete mode 100644 buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java

diff --git a/build.gradle b/build.gradle
index bce7640..fd18383 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,16 +3,46 @@
     gradle run
  */
 
-import ru.dmitriymx.gradle.plugin.LibsPlugin
-
 plugins {
     id 'java'
     id 'application'
 }
 
-apply plugin: LibsPlugin
 apply from: rootDir.toPath().resolve('logic.gradle').toFile()
 
+ext {
+    slf4j_version = '1.7.30'
+    logback_version = '1.2.3'
+    dagger2_version = '2.33'
+    junit_version = '5.5.2'
+
+    libs = [
+            lombok     : 'org.projectlombok:lombok:1.18.12',
+            annotations: 'com.google.code.findbugs:jsr305:3.0.2',
+            guava      : 'com.google.guava:guava:30.1-jre',
+            lang3      : 'org.apache.commons:commons-lang3:3.11',
+    ]
+
+    libs.logger = [
+            slf4j  : ["org.slf4j:slf4j-api:${slf4j_version}",
+                      "org.slf4j:jcl-over-slf4j:${slf4j_version}"],
+            logback: ["ch.qos.logback:logback-core:${logback_version}",
+                      "ch.qos.logback:logback-classic:${logback_version}"]
+    ]
+
+    libs.dagger2 = [
+            implementation: "com.google.dagger:dagger:${dagger2_version}",
+            annotationProcessor: "com.google.dagger:dagger-compiler:${dagger2_version}"
+    ]
+
+    libs.junit5 = [
+            api: "org.junit.jupiter:junit-jupiter-api:${junit_version}",
+            //runtime only
+            engine: "org.junit.jupiter:junit-jupiter-engine:${junit_version}",
+            params: "org.junit.jupiter:junit-jupiter-params:${junit_version}"
+    ]
+}
+
 dependencies {
     annotationProcessor libs.lombok
     compileOnly libs.lombok
diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java
deleted file mode 100644
index 05123ee..0000000
--- a/buildSrc/src/main/java/ru/dmitriymx/gradle/extention/LibsExtention.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package ru.dmitriymx.gradle.extention;
-
-import java.util.List;
-
-public class LibsExtention {
-
-	public final String lombok = "org.projectlombok:lombok:1.18.12";
-	public final String annotations = "com.google.code.findbugs:jsr305:3.0.2";
-	public final String guava = "com.google.guava:guava:30.1-jre";
-	public final String lang3 = "org.apache.commons:commons-lang3:3.11";
-
-	public final LoggerLibs logger = new LoggerLibs();
-	public final Dagger2Libs dagger2 = new Dagger2Libs();
-	public final Junit5Libs junit5 = new Junit5Libs();
-
-	public static final class LoggerLibs {
-		private final String slf4j_version = "1.7.30";
-		private final String logback_version = "1.2.3";
-
-		public final List<String> slf4j = List.of(
-				"org.slf4j:slf4j-api:" + slf4j_version,
-				"org.slf4j:jcl-over-slf4j:" + slf4j_version
-		);
-
-		public final List<String> logback = List.of(
-				"ch.qos.logback:logback-core:" + logback_version,
-				"ch.qos.logback:logback-classic:" + logback_version
-		);
-	}
-
-	public static final class Dagger2Libs {
-		private final String dagger2_version = "2.33";
-
-		public final String implementation = "com.google.dagger:dagger:" + dagger2_version;
-		public final String annotationProcessor = "com.google.dagger:dagger-compiler:" + dagger2_version;
-	}
-
-	public static final class Junit5Libs {
-		private final String junit_version = "5.5.2";
-
-		public final String api = "org.junit.jupiter:junit-jupiter-api:" + junit_version;
-		/** runtimeOnly */
-		public final String engine = "org.junit.jupiter:junit-jupiter-engine:" + junit_version;
-		public final String params = "org.junit.jupiter:junit-jupiter-params:" + junit_version;
-	}
-}
diff --git a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java b/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.java
deleted file mode 100644
index 243fa5d..0000000
--- a/buildSrc/src/main/java/ru/dmitriymx/gradle/plugin/LibsPlugin.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.LibsExtention;
-
-public class LibsPlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getExtensions().create("libs", LibsExtention.class);
-	}
-}