Merge pull request #215 from PrisonTeam/bleeding_pull_v3.2.8

Bleeding pull v3.2.8

.github/workflows/gradle.yml

@@ -22,4 +22,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
           name: Prison
-          path: prison-spigot/build/libs/Prison.jar
+          path: prison-spigot/build/libs/

README.md

@@ -35,9 +35,48 @@ If hassle-free updates and zero payments is not enough for you to consider switc
 * **New releases are heavily bug-tested.** We test every single aspect of every new release of Prison before releasing it to the community. If a release doesn't pass our rigorous update checklist, it is iterated upon until it does. What does this mean for you? Solid updates with minimal bugs for your server.
 * **Prison is always expanding.** We are always looking for ways to expand Prison with features that make your server run more smoothly. Additionally, we are always looking for contributions from the community, be it code contributions, feature requests, bug reports, translations, or documentation.
 
+
 ## Get Prison
 
-| Stable | Experimental (Nightly) |
-| ------ | ---------------------- |
-| [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://www.spigotmc.org/resources/prison.1223/) | [![Experimental Download](https://img.shields.io/badge/download-experimental-red.svg)](https://ci.appveyor.com/project/faizaand/prison/build/artifacts) | 
+
+| SpigotMC.org | Polymart.org | Bukkit.org | Experimental |
+| ------------ | ------------ | ---------- | ------------ |
+|    Stable    |    Stable    |   Stable   |    *Nightly*  |
+| [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://www.spigotmc.org/resources/prison.1223/) | [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://polymart.org/resource/prison-1-8-x-1-16-5.678/updates) | [![Stable Download](https://img.shields.io/badge/download-stable-44cc11.svg)](https://dev.bukkit.org/projects/mc-prison-v3) | [![Experimental Download](https://img.shields.io/badge/download-experimental-red.svg)](https://ci.appveyor.com/project/faizaand/prison/build/artifacts) | 
+
+
+
+
+## Gradle Configurations
+
+Prison is now able through the jitpack.io repository:
+
+[![Release](https://jitpack.io/v/PrisonTeam/Prison.svg)](https://jitpack.io/#PrisonTeam/Prison)
+
+
+Within your `repositories` section, add jitpack.io as the last entry, as suggested by jitpack.io.
+
+
+```
+allprojects {
+	repositories {
+		...
+		maven { url 'https://jitpack.io' }
+	}
+}
+```
+
+Then add the dependency as follows, but replace `Tag` with a valid tag such as `3.2.7`.  See the link to jitpack.io's website for a list of Tags that you can use; select from the tabs Releases, Builds, Branches, and Commits.
+
+```
+dependencies {
+	implementation 'com.github.PrisonTeam:Prison:Tag'
+}
+```
+
+Through jitpack.io's webpage you can select a Prison release and it will generate the correct dependency to use: [Prison repo on jitpack.io](https://jitpack.io/#PrisonTeam/Prison)
+
+
+
+<hr style="height:3px; border:none; color:#aaf; background-color:#aaf;">
 

appveyor.yml

@@ -10,7 +10,8 @@ cache:
   - C:\Users\appveyor\.gradle
 
 artifacts:
-  - path: prison-spigot\build\libs\Prison.jar
+  - path: prison-spigot\build\libs\
+    name: Prison
 
 environment:
   matrix:

build.gradle

@@ -20,6 +20,41 @@ import java.util.Date
 
 apply plugin: 'java'
 
+ext.targetArchiveClassifier = 'Java1.8'
+//ext.targetArchiveClassifier = 'Java16'
+
+
+// Lists all versions of java that are available to the toolchain
+// $ ./gradlew -q javaToolchains
+
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(8))
+//    languageVersion.set(JavaLanguageVersion.of(16))
+  }
+}
+
+
+/*
+task('Build-Java8', type: JavaCompile ) {
+
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+    
+    ext.targetArchiveClassifier = 'java1.8'
+}
+
+task('Build-Java16', type: JavaCompile ) {
+
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(16)
+    }
+    
+    ext.targetArchiveClassifier = 'java16'
+}
+*/
+
 /* Two different ways to enable utf-8 encoding within gradle, but not sure its
  * even needed at this time.  Keeping for a few builds to make sure all is ok.
 compileJava.options.encoding = 'UTF-8'
@@ -32,20 +67,23 @@ tasks.withType(JavaCompile) {
 println """
 ==========================================================================
 You are building the Prison plugin 
-  Version:    ${project.version} 
-  Build time: ${getCurrentTimestamp()}
+  Prison Version:  ${project.version} 
+  Build time:      ${getCurrentTimestamp()}
+  Java version:    
+  Test value:      ${targetArchiveClassifier}
 
 Output files are located in [subproject]/build/libs.
-The runnable JAR is usually named prison.jar.
-Example: The spigot build artifact is prison-spigot/build/libs/prison.jar
+The runnable JAR is usually named Prison-<version>.jar.
+Example: The spigot build artifact is:
+             prison-spigot/build/libs/Prison-${project.version}.jar
 ==========================================================================
 """
 
 buildscript {
 
     repositories {
         mavenCentral()
-        jcenter()
+
         maven { url "https://plugins.gradle.org/m2/" }
     }
 
@@ -58,19 +96,24 @@ buildscript {
 subprojects {
 
     apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'maven-publish'
+//    apply plugin: 'maven'
+//    apply plugin: 'maven-publish'
     apply plugin: 'com.github.johnrengelman.shadow'
 
+
     archivesBaseName = 'Prison'
+
+
     group = 'tech.mcprison.prison'
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+//    sourceCompatibility = 16
+//    targetCompatibility = 16
+//    sourceCompatibility = 1.8
+//    targetCompatibility = 1.8
 
     repositories {
         mavenCentral()
-        maven { url "http://maven.sk89q.com/repo/" }
+        maven { url "https://maven.sk89q.com/repo/" }
         maven { url "https://mvnrepository.com/artifact/org.apache.commons/commons-lang3" }
     }
 
@@ -79,10 +122,10 @@ subprojects {
     }
 
     dependencies {
-        implementation 'org.apache.commons:commons-lang3:3.10'
+        implementation 'org.apache.commons:commons-lang3:3.12.0'
         implementation 'com.google.guava:guava:19.0'
         implementation 'com.google.code.gson:gson:2.8.6'
-        testCompile 'junit:junit:4.12'
+        testImplementation 'junit:junit:4.12'
     }
 
 }

docs/changelog_v3.2.x.md

@@ -10,7 +10,9 @@
 [v3.2.3 - 2020-12-25](prison_changelog_v3.2.3.md)  
 [v3.2.4 - 2021-03-01](prison_changelog_v3.2.4.md)  
 [v3.2.5 - 2021-04-01](prison_changelog_v3.2.5.md)  
-[v3.2.6 - 2021-04-11](prison_changelog_v3.2.5.md)
+[v3.2.6 - 2021-04-11](prison_changelog_v3.2.5.md)  
+[v3.2.7 - 2021-05-02](prison_changelog_v3.2.7.md)  
+[v3.2.8 - 2021-06-17](prison_changelog_v3.2.8.md)
 
 
 Greetings!  I'm delighted that you are interested in the build logs for the