mirror of
https://github.com/plexusorg/Plex.git
synced 2024-12-23 01:27:37 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
28fba133b7
10
build.gradle
10
build.gradle
@ -67,8 +67,7 @@ publishing {
|
|||||||
from(components.java)
|
from(components.java)
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
if (System.getenv("plex_repo_user") != null && System.getenv("plex_repo_pass") != null) {
|
uri("https://nexus.telesphoreo.me/repository/plex-releases/")
|
||||||
url("https://nexus.telesphoreo.me/repository/plex-releases/")
|
|
||||||
credentials {
|
credentials {
|
||||||
username = System.getenv("plex_repo_user")
|
username = System.getenv("plex_repo_user")
|
||||||
password = System.getenv("plex_repo_pass")
|
password = System.getenv("plex_repo_pass")
|
||||||
@ -76,13 +75,11 @@ publishing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
plexSnapshots(MavenPublication) {
|
plexSnapshots(MavenPublication) {
|
||||||
from(components.java)
|
from(components.java)
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
if (System.getenv("plex_repo_user") != null && System.getenv("plex_repo_pass") != null) {
|
uri("https://nexus.telesphoreo.me/repository/plex-snapshots/")
|
||||||
url("https://nexus.telesphoreo.me/repository/plex-snapshots/")
|
|
||||||
credentials {
|
credentials {
|
||||||
username = System.getenv("plex_repo_user")
|
username = System.getenv("plex_repo_user")
|
||||||
password = System.getenv("plex_repo_pass")
|
password = System.getenv("plex_repo_pass")
|
||||||
@ -92,7 +89,6 @@ publishing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
options.encoding = 'UTF-8'
|
options.encoding = 'UTF-8'
|
||||||
@ -101,10 +97,12 @@ tasks.withType(JavaCompile) {
|
|||||||
tasks {
|
tasks {
|
||||||
build {
|
build {
|
||||||
dependsOn(shadowJar)
|
dependsOn(shadowJar)
|
||||||
|
if (System.getenv("plex_repo_user") != null && System.getenv("plex_repo_pass") != null) {
|
||||||
if (getVersion().toString().toLowerCase().endsWith("-snapshot")) {
|
if (getVersion().toString().toLowerCase().endsWith("-snapshot")) {
|
||||||
dependsOn(publishPlexSnapshotsPublicationToMaven2Repository)
|
dependsOn(publishPlexSnapshotsPublicationToMaven2Repository)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
javadoc {
|
javadoc {
|
||||||
options.memberLevel = JavadocMemberLevel.PRIVATE
|
options.memberLevel = JavadocMemberLevel.PRIVATE
|
||||||
|
@ -16,7 +16,7 @@ public enum Rank
|
|||||||
{
|
{
|
||||||
IMPOSTOR(-1, ChatColor.AQUA + "an " + ChatColor.YELLOW + "Impostor", "Impostor", "&8[&eImp&8]"),
|
IMPOSTOR(-1, ChatColor.AQUA + "an " + ChatColor.YELLOW + "Impostor", "Impostor", "&8[&eImp&8]"),
|
||||||
NONOP(0, "a " + ChatColor.WHITE + "Non-Op", "Non-Op", ""),
|
NONOP(0, "a " + ChatColor.WHITE + "Non-Op", "Non-Op", ""),
|
||||||
OP(1, "an " + ChatColor.GREEN + "Operator", "Operator", "&8[&aOp&8]"),
|
OP(1, "an " + ChatColor.GREEN + "Operator", "Operator", "&8[&aOP&8]"),
|
||||||
ADMIN(2, "an " + ChatColor.DARK_GREEN + "Admin", "Admin", "&8[&2Admin&8]"),
|
ADMIN(2, "an " + ChatColor.DARK_GREEN + "Admin", "Admin", "&8[&2Admin&8]"),
|
||||||
SENIOR_ADMIN(3, "a " + ChatColor.GOLD + "Senior Admin", "Senior Admin", "&8[&6SrA&8]"),
|
SENIOR_ADMIN(3, "a " + ChatColor.GOLD + "Senior Admin", "Senior Admin", "&8[&6SrA&8]"),
|
||||||
EXECUTIVE(4, "an " + ChatColor.RED + "Executive", "Executive", "&8[&cExec&8]");
|
EXECUTIVE(4, "an " + ChatColor.RED + "Executive", "Executive", "&8[&cExec&8]");
|
||||||
|
Loading…
Reference in New Issue
Block a user