Merge branch '1.12.2/api-7.0.0'

README.md

@@ -2,7 +2,7 @@
 
 # Eagle Factions
 
-Current version: 0.11.0
+Current version: 0.12.0
 
 ## General
 Eagle Faction is a factions/war plugin for SpongeForge. You can simply create factions and claim territories by using "power". Yes! Power! Just like in the original factions plugin made for Bukkit (and Spigot).

build.gradle

@@ -1,21 +1,68 @@
 plugins {
-    id 'org.spongepowered.plugin' version '0.8.1'
+    id 'java'
+    id 'org.spongepowered.plugin' version '0.9.0'
 }
 
 group = pluginGroup
 version = pluginVersion
 description = 'A factions plugin that will make managing your battle-server easier. :)'
 
+sourceCompatibility = 1.8
+
 allprojects {
     repositories {
+        mavenCentral()
+        jcenter()
         maven { url 'https://jitpack.io' }
     }
 }
 
 dependencies {
     compile 'org.spongepowered:spongeapi:7.1.0'
-    //compile 'com.github.rojo8399:PlaceholderAPI:master-SNAPSHOT'
-    compile group: 'com.h2database', name: 'h2', version: '1.3.148'
+    compile 'com.github.rojo8399:PlaceholderAPI:4.5.1'
+    compile group: 'com.h2database', name: 'h2', version: '1.4.196'
+//    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.16'
     //compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.7.2'
-    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.13'
+//    compile 'org.mariadb.jdbc:mariadb-java-client:2.0.3'
+}
+
+jar {
+    if(System.getenv("JENKINS_HOME")) {
+        version = version + "_" + System.getenv("BUILD_NUMBER")
+        println("File name =>" + baseName)
+    }
+}
+
+task fatJar(type: Jar) {
+    from {
+        configurations.compile.collect {it.isDirectory() ? it : zipTree(it)}
+    }
+    with jar
+}
+
+tasks.create("setPluginVersion") {
+    doLast {
+
+    }
+}
+
+tasks.create("publishBuildOnDiscord") {
+    group = "Publishing"
+    description = "Task for publishing the jar file to discord's jenkins channel"
+    doLast {
+        String[] jarFiles = new FileNameFinder().getFileNames(project.buildDir.getPath(), "**/*.jar")
+
+        if(jarFiles.length > 0) {
+            println("Found jar files: " + jarFiles)
+
+            String lastCommitDescription = "git log -1 --pretty=%B".execute().getText()
+            if(lastCommitDescription == null || lastCommitDescription == "") {
+                lastCommitDescription = "No changelog provided"
+            }
+
+            exec {
+                commandLine("java", "-jar", "..\\jenkinsdiscordbot-1.0.jar", "EagleFactions", jarFiles[0], lastCommitDescription)
+            }
+        }
+    }
 }

gradle.properties

@@ -1,3 +1,3 @@
 pluginGroup=io.github.aquerr.eaglefactions
 pluginId=eaglefactions
-pluginVersion=1.12.2-v0.11.1
+pluginVersion=1.12.2-v0.12.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jul 11 22:00:43 CEST 2017
+#Tue Apr 30 20:47:00 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip