From 09fe8c6a097836b46e485dc1cb8f47decfcf3071 Mon Sep 17 00:00:00 2001
From: ajgeiss0702 <ajgeiss72@gmail.com>
Date: Fri, 21 May 2021 15:21:19 -0700
Subject: [PATCH] 1.9.4

---
 .gitlab-ci.yml   | 34 +++++++++++++++++++++++++++++-----
 build.gradle.kts | 12 +++++-------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ea7d8b..0b7518b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,20 +5,44 @@ image: gradle:6.8.2-jdk8
 cache:
   paths:
     - .gradle
+    - ~/.gradle
 
 
 build:
+  stage: build
   script:
-  - gradle shadowJar
+    - rm -rf build
+    - gradle shadowJar
   artifacts:
     paths:
-    - build/libs
+      - build/libs
 
 pages:
+  stage: build
   image: gradle:6.8.3-jdk15
+  only:
+    - master
   script:
-  - gradle javadoc
-  - mv build/docs/javadoc public
+    - gradle javadoc
+    - mv build/docs/javadoc public
   artifacts:
     paths:
-    - public
+      - public
+
+test:
+  stage: test
+  dependencies:
+    - build
+  script:
+    - gradle test
+
+upload to updater:
+  stage: deploy
+  only:
+    - master
+  dependencies:
+    - build
+  script:
+    - cd build/libs
+    - files=(*)
+    - curl -i -F "submit=true" -F "secret=$UPLOAD_SECRET" -F "file=@${files[0]}" https://ajg0702.us/pl/updater/upload.php
diff --git a/build.gradle.kts b/build.gradle.kts
index fc111c4..df5aa3b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
  
 group = "us.ajg0702"
-version = "1.9.3"
+version = "1.9.4"
 
 repositories {
     mavenCentral()
@@ -30,6 +30,7 @@ dependencies {
     implementation("org.bstats:bstats-bungeecord:2.2.1")
 }
 
+
 tasks.withType<ProcessResources> {
     include("**/*.yml")
     filter<org.apache.tools.ant.filters.ReplaceTokens>(
@@ -47,12 +48,9 @@ tasks.shadowJar {
 
 publishing {
     publications {
-        create<MavenPublication>("maven") {
-            groupId = project.group.toString();
-            artifactId = project.name
-            version = project.version.toString()
-
-            from(components["java"])
+        create<MavenPublication>("mavenJava") {
+            //artifact(tasks["sourcesJar"])
+            artifact(tasks["jar"])
         }
     }
 }