Merge Dependencies and Repositories classes

Author: osipxd

src/main/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePlugin.groovy

@@ -6,7 +6,6 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.compile.JavaCompile
 import ru.endlesscode.bukkitgradle.util.Dependencies
-import ru.endlesscode.bukkitgradle.util.Repositories
 
 class BukkitGradlePlugin implements Plugin<Project> {
     final static String GROUP = 'Bukkit'
@@ -26,17 +25,17 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Configures project
      */
-    void configureProject() {
+    private void configureProject() {
         addPlugins()
         configureEncoding()
         addRepositories()
-        addDependencies()
+        addExtensionFunctions()
     }
 
     /**
      * Adds all needed plugins
      */
-    void addPlugins() {
+    private void addPlugins() {
         project.with {
             plugins.with {
                 apply('java')
@@ -55,7 +54,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Sets force encoding on compile to UTF-8
      */
-    void configureEncoding() {
+    private void configureEncoding() {
         project.tasks.withType(JavaCompile) {
             options.encoding = 'UTF-8'
         }
@@ -64,19 +63,22 @@ class BukkitGradlePlugin implements Plugin<Project> {
     /**
      * Adds needed repositories
      */
-    void addRepositories() {
-        Repositories.configureProject(project)
-
+    private void addRepositories() {
         project.repositories {
             mavenLocal()
             mavenCentral()
         }
     }
 
     /**
-     * Adds needed dependencies
+     * Adds repositories and dependencies extension functions
      */
-    void addDependencies() {
+    private void addExtensionFunctions() {
+        project.repositories {
+            mavenLocal()
+            mavenCentral()
+        }
+
         Dependencies.configureProject(project)
     }
 }

src/main/groovy/ru/endlesscode/bukkitgradle/util/Dependencies.groovy

@@ -3,22 +3,49 @@ package ru.endlesscode.bukkitgradle.util
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.artifacts.dsl.RepositoryHandler
 
 class Dependencies {
 
     private static Project project
-    private static DependencyHandler handler
+    private static RepositoryHandler repoHandler
+    private static DependencyHandler depHandler
 
     private Dependencies() {}
 
     static configureProject(Project project) {
         this.project = project
-        handler = project.dependencies
+        repoHandler = project.repositories
+        depHandler = project.dependencies
         addExtensions()
     }
 
     private static addExtensions() {
-        handler.ext {
+        repoHandler.ext {
+            spigot = {
+                addRepo('spigot-repo', 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
+            }
+            sk89q = {
+                addRepo('sk89q-repo', 'http://maven.sk89q.com/repo/')
+            }
+            destroystokyo = {
+                addRepo('destroystokyo-repo', 'https://repo.destroystokyo.com/repository/maven-public/')
+            }
+            dmulloy2 = {
+                addRepo('dmulloy2-repo', 'http://repo.dmulloy2.net/nexus/repository/public/')
+            }
+            md5 = {
+                addRepo('md5-repo', 'http://repo.md-5.net/content/groups/public/')
+            }
+            vault = {
+                addRepo('vault-repo', 'http://nexus.hc.to/content/repositories/pub_releases/')
+            }
+            placeholderapi = {
+                addRepo('placeholderapi-repo', 'http://repo.extendedclip.com/content/repositories/placeholderapi/')
+            }
+        }
+
+        depHandler.ext {
             spigot = { api('org.spigotmc', 'spigot') }
             spigotApi = { api('org.spigotmc', 'spigot-api') }
             bukkit = { api('org.bukkit', 'bukkit') }
@@ -27,8 +54,15 @@ class Dependencies {
         }
     }
 
+    private static addRepo(repoName, repoUrl) {
+        repoHandler.maven {
+            name = repoName
+            url = repoUrl
+        }
+    }
+
     private static Dependency api(String groupId, String artifactId) {
         def version = project.bukkit.version
-        return handler.create("$groupId:$artifactId:$version")
+        return depHandler.create("$groupId:$artifactId:$version")
     }
 }