diff --git a/.gitignore b/.gitignore index ba4c6236..d53edd9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,40 +1,12 @@ -# Created by https://www.gitignore.io/ - ### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: .idea/ *.iws /out/ *.iml .idea_modules/ - -# JIRA plugin atlassian-ide-plugin.xml -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties - - ### Eclipse ### - .metadata bin/ tmp/ @@ -46,73 +18,27 @@ local.properties .settings/ .loadpath .recommenders - -# Eclipse Core -.project - -# External tool builders .externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" *.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Java annotation processor (APT) .factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders .recommenders/ - +.apt_generated/ +.project +.classpath ### Linux ### *~ - -# temporary files which can be created if a process still has a handle open of a deleted file .fuse_hidden* - -# KDE directory preferences .directory - -# Linux trash folder which might appear on any partition or disk .Trash-* - -# .nfs files are created when an open file is removed but is still being accessed .nfs* - ### macOS ### -*.DS_Store +.DS_Store .AppleDouble .LSOverride - -# Icon must end with two \r Icon -# Thumbnails ._* -# Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd .Spotlight-V100 @@ -120,45 +46,33 @@ Icon .Trashes .VolumeIcon.icns .com.apple.timemachine.donotpresent -# Directories potentially created on remote AFP share .AppleDB .AppleDesktop Network Trash Folder Temporary Items .apdisk +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ ### Windows ### -# Windows image file caches +# Windows thumbnail cache files Thumbs.db ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares +ehthumbs_vista.db +*.stackdump +[Dd]esktop.ini $RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts *.lnk - -### Java ### -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +### Gradle ### +.gradle +/build/ +gradle-app.setting +!gradle-wrapper.jar +.gradletasknamecache diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 00000000..37afd97d --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,85 @@ +project.version = '4.2' + +dependencies { + compileOnly 'com.google.guava:guava:19.0' + compileOnly 'com.google.code.findbugs:jsr305:3.0.2' +} + +if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) { + + apply plugin: 'signing' + + task javadocJar(type: Jar) { + classifier 'javadoc' + from javadoc + } + + task sourcesJar(type: Jar) { + classifier 'sources' + from sourceSets.main.allSource + } + + artifacts { + archives javadocJar + archives sourcesJar + } + + signing { + required = false + sign configurations.archives + } + + uploadArchives { + enabled = true + + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') { + authentication(userName: sonatypeUsername, password: sonatypePassword) + } + + pom { + project { + name 'LuckPerms API' + description 'An advanced permissions plugin for Bukkit/Spigot, BungeeCord and Sponge.' + url 'https://github.com/lucko/LuckPerms' + + licenses { + license { + name 'MIT' + url 'https://opensource.org/licenses/MIT' + } + } + + developers { + developer { + name 'Luck' + email 'git@lucko.me' + url 'https://github.com/lucko' + } + } + + scm { + connection 'scm:git:https://github.com/lucko/LuckPerms.git' + developerConnection 'scm:git:git@github.com:lucko/LuckPerms.git' + url 'https://github.com/lucko/LuckPerms' + + } + + ciManagement { + system 'Jenkins' + url 'https://ci.lucko.me/job/LuckPerms' + } + + issueManagement { + system 'GitHub' + url 'https://github.com/lucko/LuckPerms/issues' + } + } + } + } + } + } +} diff --git a/api/pom.xml b/api/pom.xml deleted file mode 100644 index 03fe4629..00000000 --- a/api/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - - 4.0.0 - - luckperms-api - - - LuckPerms-API-${release.version} - - - ../ - false - - LICENSE.txt - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - deployment - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - - attach-javadocs - - jar - - - - - - https://google.github.io/guava/releases/21.0/api/docs/ - - - - - - - - - - - - com.google.guava - guava - 19.0 - provided - - - - com.google.code.findbugs - jsr305 - 3.0.2 - provided - - - - diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..6773a162 --- /dev/null +++ b/build.gradle @@ -0,0 +1,48 @@ +subprojects { + apply plugin: 'java' + apply plugin: 'maven' + + group = 'me.lucko.luckperms' + version = '4.2-SNAPSHOT' + + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + + def determinePatchVersion = { + // get the name of the last tag + def lastTag = new ByteArrayOutputStream() + exec { + commandLine 'git', 'describe', '--tags', '--abbrev=0', '@^' + standardOutput = lastTag + } + + // get a list of the commits since the last tag + def commitsSinceLastTag = new ByteArrayOutputStream() + exec { + commandLine 'git', 'log', '--oneline', lastTag.toString().trim() + '..@' + standardOutput = commitsSinceLastTag + } + + // calculate what the patch version should be + return Integer.toString(commitsSinceLastTag.toString().split("\n").length) + } + + project.ext.majorVersion = '4' + project.ext.minorVersion = '2' + project.ext.patchVersion = determinePatchVersion() + project.ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + '.' + project.ext.patchVersion + + repositories { + mavenLocal() + mavenCentral() + + maven { + name 'luck-repo' + url 'https://repo.lucko.me/' + } + } +} diff --git a/bukkit/build.gradle b/bukkit/build.gradle new file mode 100644 index 00000000..cd6d3581 --- /dev/null +++ b/bukkit/build.gradle @@ -0,0 +1,81 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4" + } +} + +apply plugin: "com.github.johnrengelman.shadow" + +repositories { + maven { + name 'spigot-repo' + url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' + } +} + +dependencies { + compile project(':luckperms-common') + + compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' + compileOnly 'me.lucko:commodore:1.0' + compileOnly('net.milkbowl.vault:VaultAPI:1.6') { + exclude(module: 'bukkit') + } + compileOnly 'lilypad.client.connect:api:0.0.1-SNAPSHOT' + + // migration plugins + compileOnly 'org.tyrannyofheaven.bukkit:zPermissions:1.3' + compileOnly('ru.tehkode:PermissionsEx:1.23.5') { + exclude(module: 'bukkit') + exclude(module: 'updater') + exclude(module: 'commons-dbcp') + exclude(module: 'AccountsClient') + } + compileOnly 'com.github.gustav9797:PowerfulPermsAPI:4.5.2' + compileOnly 'org.anjocaido:GroupManager:1.4' + compileOnly 'de.bananaco:bpermissions-api:2.12' + compileOnly('com.platymuus:bukkit-permissions:2.5') { + exclude(module: 'bukkit') + exclude(module: 'metrics') + } +} + +processResources { + from(sourceSets.main.resources.srcDirs) { + expand 'pluginVersion': project.ext.fullVersion + include 'plugin.yml' + } +} + +shadowJar { + archiveName = "LuckPerms-Bukkit-${project.ext.fullVersion}.jar" + + dependencies { + include(dependency('me.lucko.luckperms:.*')) + } + + relocate 'net.kyori.text', 'me.lucko.luckperms.lib.text' + relocate 'net.kyori.event', 'me.lucko.luckperms.lib.eventbus' + relocate 'com.github.benmanes.caffeine', 'me.lucko.luckperms.lib.caffeine' + relocate 'okio', 'me.lucko.luckperms.lib.okio' + relocate 'okhttp3', 'me.lucko.luckperms.lib.okhttp3' + relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore' + relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb' + relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql' + relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql' + relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari' + relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb' + relocate 'org.bson', 'me.lucko.luckperms.lib.bson' + relocate 'redis.clients.jedis', 'me.lucko.luckperms.lib.jedis' + relocate 'org.apache.commons.pool2', 'me.lucko.luckperms.lib.commonspool2' + relocate 'ninja.leaping.configurate', 'me.lucko.luckperms.lib.configurate' +} + +artifacts { + archives shadowJar +} \ No newline at end of file diff --git a/bukkit/pom.xml b/bukkit/pom.xml deleted file mode 100644 index d53f998e..00000000 --- a/bukkit/pom.xml +++ /dev/null @@ -1,258 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - - 4.0.0 - - luckperms-bukkit - jar - - - clean package - LuckPerms-Bukkit-${full.version} - - - src/main/resources - true - - *.yml - - - - src/main/resources - false - - luckperms-brigadier.json.gz - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - ${shade.version} - - - package - - shade - - - false - false - - - me.lucko.luckperms:luckperms-common - me.lucko.luckperms:luckperms-api - - - - - - net.kyori.text - me.lucko.luckperms.lib.text - - - net.kyori.event - me.lucko.luckperms.lib.eventbus - - - com.github.benmanes.caffeine - me.lucko.luckperms.lib.caffeine - - - okio - me.lucko.luckperms.lib.okio - - - okhttp3 - me.lucko.luckperms.lib.okhttp3 - - - me.lucko.commodore - me.lucko.luckperms.lib.commodore - - - org.mariadb.jdbc - me.lucko.luckperms.lib.mariadb - - - com.mysql - me.lucko.luckperms.lib.mysql - - - org.postgresql - me.lucko.luckperms.lib.postgresql - - - com.zaxxer.hikari - me.lucko.luckperms.lib.hikari - - - com.mongodb - me.lucko.luckperms.lib.mongodb - - - org.bson - me.lucko.luckperms.lib.bson - - - redis.clients.jedis - me.lucko.luckperms.lib.jedis - - - org.apache.commons.pool2 - me.lucko.luckperms.lib.commonspool2 - - - ninja.leaping.configurate - me.lucko.luckperms.lib.configurate - - - - - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - compile - - - - - org.spigotmc - spigot-api - 1.12.2-R0.1-SNAPSHOT - provided - - - - - me.lucko - commodore - 1.0 - provided - - - - - - net.milkbowl.vault - VaultAPI - 1.6 - provided - - - org.bukkit - bukkit - - - - - - lilypad.client.connect - api - 0.0.1-SNAPSHOT - provided - - - - org.tyrannyofheaven.bukkit - zPermissions - 1.3 - provided - - - - ru.tehkode - PermissionsEx - 1.23.5 - provided - - - org.bukkit - bukkit - - - net.gravitydevelopment.updater - updater - - - commons-dbcp - commons-dbcp - - - com.mojang - AccountsClient - - - - - - com.github.gustav9797 - PowerfulPermsAPI - 4.5.2 - provided - - - - org.anjocaido - GroupManager - 1.4 - provided - - - - de.bananaco - bpermissions-api - 2.12 - provided - - - - com.platymuus - bukkit-permissions - 2.5 - provided - - - org.bukkit - bukkit - - - org.mcstats.bukkit - metrics - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 0b380e87..6fabeaff 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: LuckPerms -version: ${full.version} +version: ${pluginVersion} description: A permissions plugin author: Luck website: https://github.com/lucko/LuckPerms diff --git a/bungee/build.gradle b/bungee/build.gradle new file mode 100644 index 00000000..9063435f --- /dev/null +++ b/bungee/build.gradle @@ -0,0 +1,65 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4" + } +} + +apply plugin: "com.github.johnrengelman.shadow" + +dependencies { + compile project(':luckperms-common') + + compileOnly 'net.md-5:bungeecord-api:1.12-SNAPSHOT' + compileOnly 'com.imaginarycode.minecraft:RedisBungee:0.4' + + // migration plugins + compileOnly('net.alpenblock:BungeePerms:3.0') { + exclude(module: 'bungeecord-api') + exclude(module: 'lombok') + exclude(module: 'spigot-api') + exclude(module: 'worldedit') + exclude(module: 'Vault') + exclude(module: 'Essentials') + exclude(module: 'EssentialsX') + } +} + +processResources { + from(sourceSets.main.resources.srcDirs) { + expand 'pluginVersion': project.ext.fullVersion + include 'plugin.yml' + } +} + +shadowJar { + archiveName = "LuckPerms-Bungee-${project.ext.fullVersion}.jar" + + dependencies { + include(dependency('me.lucko.luckperms:.*')) + } + + relocate 'net.kyori.text', 'me.lucko.luckperms.lib.text' + relocate 'net.kyori.event', 'me.lucko.luckperms.lib.eventbus' + relocate 'com.github.benmanes.caffeine', 'me.lucko.luckperms.lib.caffeine' + relocate 'okio', 'me.lucko.luckperms.lib.okio' + relocate 'okhttp3', 'me.lucko.luckperms.lib.okhttp3' + relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore' + relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb' + relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql' + relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql' + relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari' + relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb' + relocate 'org.bson', 'me.lucko.luckperms.lib.bson' + relocate 'redis.clients.jedis', 'me.lucko.luckperms.lib.jedis' + relocate 'org.apache.commons.pool2', 'me.lucko.luckperms.lib.commonspool2' + relocate 'ninja.leaping.configurate', 'me.lucko.luckperms.lib.configurate' +} + +artifacts { + archives shadowJar +} diff --git a/bungee/pom.xml b/bungee/pom.xml deleted file mode 100644 index 074ebb0e..00000000 --- a/bungee/pom.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - - 4.0.0 - - luckperms-bungee - jar - - - clean package - LuckPerms-Bungee-${full.version} - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - ${shade.version} - - - package - - shade - - - false - false - - - me.lucko.luckperms:luckperms-common - me.lucko.luckperms:luckperms-api - - - - - - net.kyori.text - me.lucko.luckperms.lib.text - - - net.kyori.event - me.lucko.luckperms.lib.eventbus - - - com.github.benmanes.caffeine - me.lucko.luckperms.lib.caffeine - - - okio - me.lucko.luckperms.lib.okio - - - okhttp3 - me.lucko.luckperms.lib.okhttp3 - - - org.mariadb.jdbc - me.lucko.luckperms.lib.mariadb - - - com.mysql - me.lucko.luckperms.lib.mysql - - - org.postgresql - me.lucko.luckperms.lib.postgresql - - - com.zaxxer.hikari - me.lucko.luckperms.lib.hikari - - - com.mongodb - me.lucko.luckperms.lib.mongodb - - - org.bson - me.lucko.luckperms.lib.bson - - - redis.clients.jedis - me.lucko.luckperms.lib.jedis - - - org.apache.commons.pool2 - me.lucko.luckperms.lib.commonspool2 - - - ninja.leaping.configurate - me.lucko.luckperms.lib.configurate - - - - - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - compile - - - - - net.md-5 - bungeecord-api - 1.12-SNAPSHOT - provided - - - - - - com.imaginarycode.minecraft - RedisBungee - 0.4 - provided - - - - net.alpenblock - BungeePerms - 3.0 - provided - - - net.md-5 - bungeecord-api - - - org.projectlombok - lombok - - - org.spigotmc - spigot-api - - - com.sk89q - worldedit - - - net.milkbowl.vault - Vault - - - net.ess3 - Essentials - - - net.ess3 - EssentialsX - - - - - - diff --git a/bungee/src/main/resources/plugin.yml b/bungee/src/main/resources/plugin.yml index 0220db22..e099ed09 100644 --- a/bungee/src/main/resources/plugin.yml +++ b/bungee/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: LuckPerms -version: ${full.version} +version: ${pluginVersion} description: A permissions plugin author: Luck main: me.lucko.luckperms.bungee.LPBungeeBootstrap diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 00000000..563b01ef --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,36 @@ +dependencies { + compile project(':luckperms-api') + + compile 'com.google.code.findbugs:jsr305:3.0.2' + compile('net.kyori:text:1.11-1.6.2') { + exclude(module: 'checker-qual') + exclude(module: 'guava') + exclude(module: 'gson') + } + compile('net.kyori:event-api:2.0.1') { + exclude(module: 'checker-qual') + exclude(module: 'guava') + } + compile 'com.google.code.gson:gson:2.7' + compile 'com.google.guava:guava:19.0' + compile 'com.github.ben-manes.caffeine:caffeine:2.6.2' + compile 'com.squareup.okhttp3:okhttp:3.10.0' + compile 'com.squareup.okio:okio:1.14.1' + compile('me.lucko.configurate:configurate-core:3.5') { + exclude(module: 'guava') + } + compile('me.lucko.configurate:configurate-yaml:3.5') { + exclude(module: 'snakeyaml') + } + compile('me.lucko.configurate:configurate-gson:3.5') { + exclude(module: 'gson') + } + compile 'me.lucko.configurate:configurate-hocon:3.5' + compile('me.lucko.configurate:configurate-toml:3.5') { + exclude(module: 'toml4j') + } + compile 'com.zaxxer:HikariCP:3.2.0' + compile 'redis.clients:jedis:2.9.0' + compile 'org.mongodb:mongo-java-driver:3.7.1' + compile 'org.yaml:snakeyaml:1.14' +} diff --git a/common/pom.xml b/common/pom.xml deleted file mode 100644 index d117b01a..00000000 --- a/common/pom.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - - 4.0.0 - - luckperms-common - jar - - - LuckPerms-Common-${full.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - me.lucko.luckperms - luckperms-api - ${project.version} - compile - - - - - com.google.code.findbugs - jsr305 - 3.0.2 - compile - - - - - net.kyori - text - 1.11-1.6.2 - compile - - - org.checkerframework - checker-qual - - - com.google.guava - guava - - - com.google.code.gson - gson - - - - - - - net.kyori - event-api - 2.0.1 - compile - - - org.checkerframework - checker-qual - - - com.google.guava - guava - - - - - - - - com.google.code.gson - gson - 2.7 - - - - com.google.guava - guava - 19.0 - - - - com.github.ben-manes.caffeine - caffeine - 2.6.2 - - - - com.squareup.okhttp3 - okhttp - 3.10.0 - - - - com.squareup.okio - okio - 1.14.1 - - - - - me.lucko.configurate - configurate-core - 3.5 - - - com.google.guava - guava - - - - - - me.lucko.configurate - configurate-yaml - 3.5 - - - org.yaml - snakeyaml - - - - - - me.lucko.configurate - configurate-gson - 3.5 - - - com.google.code.gson - gson - - - - - - me.lucko.configurate - configurate-hocon - 3.5 - - - - me.lucko.configurate - configurate-toml - 3.5 - - - com.moandjiezana.toml - toml4j - - - - - - com.zaxxer - HikariCP - 3.2.0 - - - - redis.clients - jedis - 2.9.0 - - - - org.mongodb - mongo-java-driver - 3.7.1 - - - - org.yaml - snakeyaml - 1.14 - - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..1948b907 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d2c45a4b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/nukkit/build.gradle b/nukkit/build.gradle new file mode 100644 index 00000000..86f0e70e --- /dev/null +++ b/nukkit/build.gradle @@ -0,0 +1,60 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4" + } +} + +apply plugin: "com.github.johnrengelman.shadow" + +repositories { + maven { + name 'nukkit-repo' + url 'https://repo.potestas.xyz/main/' + } +} + +dependencies { + compile project(':luckperms-common') + + compileOnly 'cn.nukkit:nukkit:1.0-SNAPSHOT' +} + +processResources { + from(sourceSets.main.resources.srcDirs) { + expand 'pluginVersion': project.ext.fullVersion + include 'plugin.yml' + } +} + +shadowJar { + archiveName = "LuckPerms-Nukkit-${project.ext.fullVersion}.jar" + + dependencies { + include(dependency('me.lucko.luckperms:.*')) + } + + relocate 'net.kyori.text', 'me.lucko.luckperms.lib.text' + relocate 'net.kyori.event', 'me.lucko.luckperms.lib.eventbus' + relocate 'com.github.benmanes.caffeine', 'me.lucko.luckperms.lib.caffeine' + relocate 'okio', 'me.lucko.luckperms.lib.okio' + relocate 'okhttp3', 'me.lucko.luckperms.lib.okhttp3' + relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore' + relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb' + relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql' + relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql' + relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari' + relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb' + relocate 'org.bson', 'me.lucko.luckperms.lib.bson' + relocate 'redis.clients.jedis', 'me.lucko.luckperms.lib.jedis' + relocate 'org.apache.commons.pool2', 'me.lucko.luckperms.lib.commonspool2' + relocate 'ninja.leaping.configurate', 'me.lucko.luckperms.lib.configurate' +} + +artifacts { + archives shadowJar +} diff --git a/nukkit/pom.xml b/nukkit/pom.xml deleted file mode 100644 index 956a7d8b..00000000 --- a/nukkit/pom.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - - 4.0.0 - - luckperms-nukkit - jar - - - clean package - LuckPerms-Nukkit-${full.version} - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - ${shade.version} - - - package - - shade - - - false - false - - - me.lucko.luckperms:luckperms-common - me.lucko.luckperms:luckperms-api - - - - - - net.kyori.text - me.lucko.luckperms.lib.text - - - net.kyori.event - me.lucko.luckperms.lib.eventbus - - - com.github.benmanes.caffeine - me.lucko.luckperms.lib.caffeine - - - okio - me.lucko.luckperms.lib.okio - - - okhttp3 - me.lucko.luckperms.lib.okhttp3 - - - org.mariadb.jdbc - me.lucko.luckperms.lib.mariadb - - - com.mysql - me.lucko.luckperms.lib.mysql - - - org.postgresql - me.lucko.luckperms.lib.postgresql - - - com.zaxxer.hikari - me.lucko.luckperms.lib.hikari - - - com.mongodb - me.lucko.luckperms.lib.mongodb - - - org.bson - me.lucko.luckperms.lib.bson - - - redis.clients.jedis - me.lucko.luckperms.lib.jedis - - - org.apache.commons.pool2 - me.lucko.luckperms.lib.commonspool2 - - - ninja.leaping.configurate - me.lucko.luckperms.lib.configurate - - - - - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - compile - - - - - cn.nukkit - nukkit - 1.0-SNAPSHOT - provided - - - - - - nukkit-repo - https://repo.potestas.xyz/main/ - - - - diff --git a/nukkit/src/main/resources/plugin.yml b/nukkit/src/main/resources/plugin.yml index e20d1045..80797db0 100644 --- a/nukkit/src/main/resources/plugin.yml +++ b/nukkit/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: LuckPerms -version: ${full.version} +version: ${pluginVersion} api: ["1.0.5"] description: A permissions plugin author: Luck diff --git a/pom.xml b/pom.xml deleted file mode 100644 index b4479a4d..00000000 --- a/pom.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - 4.0.0 - - me.lucko.luckperms - luckperms - 4.2-SNAPSHOT - - - api - common - bukkit - bungee - sponge/sponge-service - sponge/sponge-service-api6 - sponge/sponge-service-api7 - sponge - nukkit - - - LuckPerms - An advanced permissions plugin for Bukkit/Spigot, BungeeCord and Sponge. - https://github.com/lucko/LuckPerms - - - - MIT - https://opensource.org/licenses/MIT - - - - - - Luck - git@lucko.me - https://github.com/lucko - - - - - scm:git:https://github.com/lucko/LuckPerms.git - scm:git:git@github.com:lucko/LuckPerms.git - https://github.com/lucko/LuckPerms - - - pom - - - UTF-8 - - - true - true - - - 4.2 - - - ${git.closest.tag.commit.count} - - ${release.version}.${patch.version} - - - 3.7.0 - 3.1.0 - - - - - luck-snapshots - https://nexus.lucko.me/repository/maven-snapshots/ - - - luck-releases - https://nexus.lucko.me/repository/maven-releases/ - - - - - Jenkins - https://ci.lucko.me/job/LuckPerms - - - - GitHub - https://github.com/lucko/LuckPerms/issues - - - - - - pl.project13.maven - git-commit-id-plugin - 2.2.2 - - - validate - - revision - - - - - false - true - true - - - - - - - - sign - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - - - - ossrh - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - - luck-repo - https://repo.lucko.me/ - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..5225264b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,24 @@ +rootProject.name = 'luckperms' + +include 'api' +findProject(':api')?.name = 'luckperms-api' + +include 'common' +findProject(':common')?.name = 'luckperms-common' + +include 'bukkit' +findProject(':bukkit')?.name = 'luckperms-bukkit' + +include 'bungee' +findProject(':bungee')?.name = 'luckperms-bungee' + +include 'sponge' +findProject(':sponge')?.name = 'luckperms-sponge' +include 'sponge:sponge-service', 'sponge:sponge-service-api6', 'sponge:sponge-service-api7' + +include 'nukkit' +findProject(':nukkit')?.name = 'luckperms-nukkit' + + + + diff --git a/sponge/build.gradle b/sponge/build.gradle new file mode 100644 index 00000000..479b07be --- /dev/null +++ b/sponge/build.gradle @@ -0,0 +1,68 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4" + classpath "gradle.plugin.ninja.miserable:blossom:1.0.1" + } +} + +apply plugin: "com.github.johnrengelman.shadow" +apply plugin: "ninja.miserable.blossom" + +repositories { + maven { + name 'sponge-repo' + url 'https://repo.spongepowered.org/maven' + } +} + +dependencies { + compile project(':luckperms-common') + compile project(':sponge:sponge-service') + compile project(':sponge:sponge-service-api6') + compile project(':sponge:sponge-service-api7') + + compileOnly('org.spongepowered:spongeapi:8.0.0-SNAPSHOT') { + exclude(module: 'configurate-core') + exclude(module: 'configurate-hocon') + exclude(module: 'configurate-gson') + exclude(module: 'configurate-yaml') + } +} + +blossom { + replaceTokenIn('src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java') + replaceToken '@version@', project.ext.fullVersion +} + +shadowJar { + archiveName = "LuckPerms-Sponge-${project.ext.fullVersion}.jar" + + dependencies { + include(dependency('me.lucko.luckperms:.*')) + } + + relocate 'net.kyori.text', 'me.lucko.luckperms.lib.text' + relocate 'net.kyori.event', 'me.lucko.luckperms.lib.eventbus' + relocate 'com.github.benmanes.caffeine', 'me.lucko.luckperms.lib.caffeine' + relocate 'okio', 'me.lucko.luckperms.lib.okio' + relocate 'okhttp3', 'me.lucko.luckperms.lib.okhttp3' + relocate 'me.lucko.commodore', 'me.lucko.luckperms.lib.commodore' + relocate 'org.mariadb.jdbc', 'me.lucko.luckperms.lib.mariadb' + relocate 'com.mysql', 'me.lucko.luckperms.lib.mysql' + relocate 'org.postgresql', 'me.lucko.luckperms.lib.postgresql' + relocate 'com.zaxxer.hikari', 'me.lucko.luckperms.lib.hikari' + relocate 'com.mongodb', 'me.lucko.luckperms.lib.mongodb' + relocate 'org.bson', 'me.lucko.luckperms.lib.bson' + relocate 'redis.clients.jedis', 'me.lucko.luckperms.lib.jedis' + relocate 'org.apache.commons.pool2', 'me.lucko.luckperms.lib.commonspool2' + relocate 'ninja.leaping.configurate', 'me.lucko.luckperms.lib.configurate' +} + +artifacts { + archives shadowJar +} diff --git a/sponge/pom.xml b/sponge/pom.xml deleted file mode 100644 index 74810298..00000000 --- a/sponge/pom.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - - 4.0.0 - - luckperms-sponge - jar - - - clean package - LuckPerms-Sponge-${full.version} - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - ${shade.version} - - - package - - shade - - - false - false - - - me.lucko.luckperms:luckperms-common - me.lucko.luckperms:luckperms-api - me.lucko.luckperms:luckperms-sponge-service - me.lucko.luckperms:luckperms-sponge-service-api6 - me.lucko.luckperms:luckperms-sponge-service-api7 - - - - - - net.kyori.text - me.lucko.luckperms.lib.text - - - net.kyori.event - me.lucko.luckperms.lib.eventbus - - - com.github.benmanes.caffeine - me.lucko.luckperms.lib.caffeine - - - okio - me.lucko.luckperms.lib.okio - - - okhttp3 - me.lucko.luckperms.lib.okhttp3 - - - org.mariadb.jdbc - me.lucko.luckperms.lib.mariadb - - - com.mysql - me.lucko.luckperms.lib.mysql - - - org.postgresql - me.lucko.luckperms.lib.postgresql - - - com.zaxxer.hikari - me.lucko.luckperms.lib.hikari - - - com.mongodb - me.lucko.luckperms.lib.mongodb - - - org.bson - me.lucko.luckperms.lib.bson - - - redis.clients.jedis - me.lucko.luckperms.lib.jedis - - - org.apache.commons.pool2 - me.lucko.luckperms.lib.commonspool2 - - - ninja.leaping.configurate - me.lucko.luckperms.lib.configurate - - - - - - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - filter-src - - filter-sources - - - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - compile - - - - - me.lucko.luckperms - luckperms-sponge-service - ${project.version} - compile - - - - me.lucko.luckperms - luckperms-sponge-service-api6 - ${project.version} - compile - - - - me.lucko.luckperms - luckperms-sponge-service-api7 - ${project.version} - compile - - - - - org.spongepowered - spongeapi - 8.0.0-SNAPSHOT - provided - - - ninja.leaping.configurate - configurate-core - - - ninja.leaping.configurate - configurate-hocon - - - ninja.leaping.configurate - configurate-gson - - - ninja.leaping.configurate - configurate-yaml - - - org.spongepowered - configurate-core - - - org.spongepowered - configurate-hocon - - - org.spongepowered - configurate-gson - - - org.spongepowered - configurate-yaml - - - - - - - - sponge-repo - https://repo.spongepowered.org/maven - - - - diff --git a/sponge/sponge-service-api6/build.gradle b/sponge/sponge-service-api6/build.gradle new file mode 100644 index 00000000..d94f2aa2 --- /dev/null +++ b/sponge/sponge-service-api6/build.gradle @@ -0,0 +1,18 @@ +dependencies { + compile project(':luckperms-common') + compile project(':sponge:sponge-service') + + compileOnly('org.spongepowered:spongeapi:6.0.0') { + exclude(module: 'configurate-core') + exclude(module: 'configurate-hocon') + exclude(module: 'configurate-gson') + exclude(module: 'configurate-yaml') + } +} + +repositories { + maven { + name 'sponge-repo' + url 'https://repo.spongepowered.org/maven' + } +} diff --git a/sponge/sponge-service-api6/pom.xml b/sponge/sponge-service-api6/pom.xml deleted file mode 100644 index 060e2e9c..00000000 --- a/sponge/sponge-service-api6/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - ../../pom.xml - - 4.0.0 - - luckperms-sponge-service-api6 - jar - - - clean package - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - provided - - - - - me.lucko.luckperms - luckperms-sponge-service - ${project.version} - provided - - - - - org.spongepowered - spongeapi - 6.0.0 - provided - - - ninja.leaping.configurate - configurate-core - - - ninja.leaping.configurate - configurate-hocon - - - ninja.leaping.configurate - configurate-gson - - - ninja.leaping.configurate - configurate-yaml - - - - - - - - sponge-repo - https://repo.spongepowered.org/maven - - - - diff --git a/sponge/sponge-service-api7/build.gradle b/sponge/sponge-service-api7/build.gradle new file mode 100644 index 00000000..78cc0103 --- /dev/null +++ b/sponge/sponge-service-api7/build.gradle @@ -0,0 +1,18 @@ +dependencies { + compile project(':luckperms-common') + compile project(':sponge:sponge-service') + + compileOnly('org.spongepowered:spongeapi:7.0.0') { + exclude(module: 'configurate-core') + exclude(module: 'configurate-hocon') + exclude(module: 'configurate-gson') + exclude(module: 'configurate-yaml') + } +} + +repositories { + maven { + name 'sponge-repo' + url 'https://repo.spongepowered.org/maven' + } +} diff --git a/sponge/sponge-service-api7/pom.xml b/sponge/sponge-service-api7/pom.xml deleted file mode 100644 index ebe773aa..00000000 --- a/sponge/sponge-service-api7/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - ../../pom.xml - - 4.0.0 - - luckperms-sponge-service-api7 - jar - - - clean package - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - provided - - - - - me.lucko.luckperms - luckperms-sponge-service - ${project.version} - provided - - - - - org.spongepowered - spongeapi - 7.0.0 - provided - - - ninja.leaping.configurate - configurate-core - - - ninja.leaping.configurate - configurate-hocon - - - ninja.leaping.configurate - configurate-gson - - - ninja.leaping.configurate - configurate-yaml - - - - - - - - sponge-repo - https://repo.spongepowered.org/maven - - - - diff --git a/sponge/sponge-service/build.gradle b/sponge/sponge-service/build.gradle new file mode 100644 index 00000000..9f15ddba --- /dev/null +++ b/sponge/sponge-service/build.gradle @@ -0,0 +1,18 @@ +dependencies { + compile project(':luckperms-common') + + compileOnly('org.spongepowered:spongeapi:7.0.0') { + exclude(module: 'configurate-core') + exclude(module: 'configurate-hocon') + exclude(module: 'configurate-gson') + exclude(module: 'configurate-yaml') + } + compileOnly 'com.google.guava:guava:21.0' +} + +repositories { + maven { + name 'sponge-repo' + url 'https://repo.spongepowered.org/maven' + } +} diff --git a/sponge/sponge-service/pom.xml b/sponge/sponge-service/pom.xml deleted file mode 100644 index dcee62fc..00000000 --- a/sponge/sponge-service/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - luckperms - me.lucko.luckperms - 4.2-SNAPSHOT - ../../pom.xml - - 4.0.0 - - luckperms-sponge-service - jar - - - clean package - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.8 - 1.8 - - - - - - - - - me.lucko.luckperms - luckperms-common - ${project.version} - provided - - - - - org.spongepowered - spongeapi - 7.0.0 - provided - true - - - ninja.leaping.configurate - configurate-core - - - ninja.leaping.configurate - configurate-hocon - - - ninja.leaping.configurate - configurate-gson - - - ninja.leaping.configurate - configurate-yaml - - - - - - - com.google.guava - guava - 21.0 - provided - - - - - - sponge-repo - https://repo.spongepowered.org/maven - - - - diff --git a/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java b/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java deleted file mode 100644 index 3f2cd0ac..00000000 --- a/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of LuckPerms, licensed under the MIT License. - * - * Copyright (c) lucko (Luck) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package me.lucko.luckperms.sponge.utils; - -public class VersionData { - - public static final String VERSION = "${full.version}"; - -} diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java index d0c2eb6b..e07056fe 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java @@ -35,7 +35,6 @@ import me.lucko.luckperms.common.plugin.logging.PluginLogger; import me.lucko.luckperms.common.plugin.logging.Slf4jPluginLogger; import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter; import me.lucko.luckperms.common.utils.MoreFiles; -import me.lucko.luckperms.sponge.utils.VersionData; import org.slf4j.Logger; import org.spongepowered.api.Game; @@ -69,7 +68,7 @@ import java.util.stream.Stream; @Plugin( id = "luckperms", name = "LuckPerms", - version = VersionData.VERSION, + version = "@version@", authors = "Luck", description = "A permissions plugin", url = "https://github.com/lucko/LuckPerms" @@ -215,7 +214,7 @@ public class LPSpongeBootstrap implements LuckPermsBootstrap { @Override public String getVersion() { - return VersionData.VERSION; + return "@version@"; } @Override