From 8c9533882efabdccab0cd677b5827b634f1ce195 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 29 Aug 2021 16:03:43 -0700 Subject: [PATCH] ultraperms no longer required to compile ajqueueplus --- .gitlab-ci.yml | 8 ++++++-- README.md | 3 --- build.gradle.kts | 2 +- libs/private/README.md | 7 +------ premium/build.gradle.kts | 2 ++ 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcd3c01..2f10833 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,10 +13,13 @@ build: stage: build script: - gradle clean :free:shadowJar + - mv free/build/libs/ajQueue*.jar jars/ + - gradle :premium:shadowJar + - mv premium/build/libs/ajQueue*.jar jars/ artifacts: untracked: true paths: - - free/build/libs + - jars pages: stage: build @@ -54,6 +57,7 @@ upload to updater: dependencies: - build script: - - cd free/build/libs + - cd jars - files=(*) - curl -i -F "submit=true" -F "secret=$UPLOAD_SECRET" -F "file=@${files[0]}" https://ajg0702.us/pl/updater/upload.php + - curl -i -F "submit=true" -F "secret=$UPLOAD_SECRET" -F "file=@${files[1]}" https://ajg0702.us/pl/updater/upload.php diff --git a/README.md b/README.md index 556f3b5..05ec4a6 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,3 @@ updating my plugin. If you need *any* help making your changes, feel free to contact me on discord. The invite link is on the plugin page ;) - -# Note on compiling ajQueuePlus -If you want to compile ajQueuePlus, please read the readme file that is in libs/private \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 800730e..f9159a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } allprojects { - version = "2.0.6" + version = "2.0.7-pre1" group = "us.ajg0702" plugins.apply("java") diff --git a/libs/private/README.md b/libs/private/README.md index d84eb3f..3b81388 100644 --- a/libs/private/README.md +++ b/libs/private/README.md @@ -1,6 +1 @@ -If you want to compile ajQueuePlus, you will need to put the UltraPermissions jar here. - -Either that, or remove the UltraPermissionsHook and its 1 reference - -eventually I will make a fake dependency with just the class structure so you dont have to do this, -but i havent done that yet :p \ No newline at end of file +This is where premium dependencies would go. Currently there is none required. \ No newline at end of file diff --git a/premium/build.gradle.kts b/premium/build.gradle.kts index 14d53f7..871b61e 100644 --- a/premium/build.gradle.kts +++ b/premium/build.gradle.kts @@ -21,6 +21,8 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") + compileOnly("me.TechsCode:FakeUltraPerms:1.0.2") + compileOnly("us.ajg0702:ajUtils:1.1.10") compileOnly("net.kyori:adventure-api:4.8.1")