From 1a23102f2e3a259be0563c660daddaa3dbf4fcff Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Thu, 7 Jan 2021 01:42:10 +0300
Subject: [PATCH] =?UTF-8?q?gradle:=20libs.gradle=20=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=B2?=
 =?UTF-8?q?=20gradle-plugin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  5 +++-
 .../FilteringDependenciesExtention.groovy     |  2 ++
 .../FilteringDependenciesPlugin.groovy        |  2 ++
 .../src/main/groovy/libs/LibsExtention.groovy | 25 +++++++++++++++++++
 .../src/main/groovy/libs/LibsPlugin.groovy    | 12 +++++++++
 libs.gradle                                   | 25 -------------------
 6 files changed, 45 insertions(+), 26 deletions(-)
 rename buildSrc/src/main/groovy/{ => fildep}/FilteringDependenciesExtention.groovy (97%)
 rename buildSrc/src/main/groovy/{ => fildep}/FilteringDependenciesPlugin.groovy (94%)
 create mode 100644 buildSrc/src/main/groovy/libs/LibsExtention.groovy
 create mode 100644 buildSrc/src/main/groovy/libs/LibsPlugin.groovy
 delete mode 100644 libs.gradle

diff --git a/build.gradle b/build.gradle
index 78bea37..6c156a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,12 @@
+import fildep.FilteringDependenciesPlugin
+import libs.LibsPlugin
+
 plugins {
     id 'java'
 }
 
 apply plugin: FilteringDependenciesPlugin
-apply from: 'libs.gradle'
+apply plugin: LibsPlugin
 
 def publishScript = file(rootProject.getProjectDir().getPath() + '/publish.gradle')
 if (publishScript.exists()) {
diff --git a/buildSrc/src/main/groovy/FilteringDependenciesExtention.groovy b/buildSrc/src/main/groovy/fildep/FilteringDependenciesExtention.groovy
similarity index 97%
rename from buildSrc/src/main/groovy/FilteringDependenciesExtention.groovy
rename to buildSrc/src/main/groovy/fildep/FilteringDependenciesExtention.groovy
index 9cec6a2..3fcbdf5 100644
--- a/buildSrc/src/main/groovy/FilteringDependenciesExtention.groovy
+++ b/buildSrc/src/main/groovy/fildep/FilteringDependenciesExtention.groovy
@@ -1,3 +1,5 @@
+package fildep
+
 class FilteringDependenciesExtention {
 
     /**
diff --git a/buildSrc/src/main/groovy/FilteringDependenciesPlugin.groovy b/buildSrc/src/main/groovy/fildep/FilteringDependenciesPlugin.groovy
similarity index 94%
rename from buildSrc/src/main/groovy/FilteringDependenciesPlugin.groovy
rename to buildSrc/src/main/groovy/fildep/FilteringDependenciesPlugin.groovy
index 5aa04b7..72a165f 100644
--- a/buildSrc/src/main/groovy/FilteringDependenciesPlugin.groovy
+++ b/buildSrc/src/main/groovy/fildep/FilteringDependenciesPlugin.groovy
@@ -1,3 +1,5 @@
+package fildep
+
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
diff --git a/buildSrc/src/main/groovy/libs/LibsExtention.groovy b/buildSrc/src/main/groovy/libs/LibsExtention.groovy
new file mode 100644
index 0000000..fe507c3
--- /dev/null
+++ b/buildSrc/src/main/groovy/libs/LibsExtention.groovy
@@ -0,0 +1,25 @@
+package libs
+
+class LibsExtention {
+    private def junit_version = '5.5.2'
+
+    final def commons_text = 'org.apache.commons:commons-text:1.9'
+    final def lombok = 'org.projectlombok:lombok:1.18.12'
+    final def refobj = 'ru.dmitriymx:reflection-object:1.0-BETA'
+
+    final def bukkit = [lib: 'org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT', exclude: [
+            'com.google.code.gson:gson',
+            'com.googlecode.json-simple:json-simple',
+            'commons-lang:commons-lang',
+            'org.yaml:snakeyaml'
+    ]]
+
+    final def test = [
+            junit5: [
+                    "org.junit.jupiter:junit-jupiter-api:$junit_version",
+                    "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+            ],
+            mock  : ['org.mockito:mockito-core:1.10.19'],
+            h2db  : 'com.h2database:h2:1.4.200'
+    ]
+}
diff --git a/buildSrc/src/main/groovy/libs/LibsPlugin.groovy b/buildSrc/src/main/groovy/libs/LibsPlugin.groovy
new file mode 100644
index 0000000..0280438
--- /dev/null
+++ b/buildSrc/src/main/groovy/libs/LibsPlugin.groovy
@@ -0,0 +1,12 @@
+package libs
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class LibsPlugin implements Plugin<Project> {
+
+    @Override
+    void apply(Project project) {
+        project.extensions.create('libs', LibsExtention)
+    }
+}
diff --git a/libs.gradle b/libs.gradle
deleted file mode 100644
index d39f9fa..0000000
--- a/libs.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-ext {
-    versions = [junit: '5.5.2']
-
-    //noinspection GroovyAssignabilityCheck
-    libs = [
-            bukkit      : [lib: 'org.bukkit:bukkit:1.12.2-R0.1-SNAPSHOT', exclude: [
-                    'com.google.code.gson:gson',
-                    'com.googlecode.json-simple:json-simple',
-                    'commons-lang:commons-lang',
-                    'org.yaml:snakeyaml'
-            ]],
-            commons_text: 'org.apache.commons:commons-text:1.9',
-            lombok      : 'org.projectlombok:lombok:1.18.12',
-            refobj      : 'ru.dmitriymx:reflection-object:1.0-BETA',
-
-            test        : [
-                    junit5: [
-                            "org.junit.jupiter:junit-jupiter-api:$versions.junit",
-                            "org.junit.jupiter:junit-jupiter-engine:$versions.junit"
-                    ],
-                    mock  : ['org.mockito:mockito-core:1.10.19'],
-                    h2db  : 'com.h2database:h2:1.4.200'
-            ]
-    ]
-}
\ No newline at end of file