Fixed CI artifacts and some other gradle things

anvilpowered · Jan 31, 2020 · 75ef9fa · 75ef9fa
1 parent 19e8de2
commit 75ef9fa
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,11 +48,11 @@ jobs: # a collection of steps
           command: |
             # Skip this for other nodes
             if [ "$CIRCLE_NODE_INDEX" == 0 ]; then
-              ./gradlew assemble
+              ./gradlew assemble -PbuildNumber=$CIRCLE_BUILD_NUM
             fi
       # As the JAR was only assembled in the first build container, build/libs will be empty in all the other build containers.
       - store_artifacts:
-          path: build/libs
+          path: sponge/build/libs
       # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples
 workflows:
   version: 2

diff --git a/MSRepository b/MSRepository
diff --git a/api/build.gradle b/api/build.gradle
@@ -2,11 +2,6 @@ plugins {
     id 'java'
 }
 
-group 'rocks.milspecsg'
-version '0.1.0-dev'
-
-sourceCompatibility = 1.8
-
 repositories {
     mavenCentral()
     maven { url 'https://jitpack.io' }

diff --git a/build.gradle b/build.gradle
@@ -2,16 +2,11 @@ plugins {
     id 'java'
 }
 
-group 'rocks.milspecsg'
-version '0.1.0-dev'
-
-sourceCompatibility = 1.8
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
+subprojects {
+    if (project.hasProperty("buildNumber") && modVersion.contains("-SNAPSHOT")) {
+        modVersion = modVersion.replace("-SNAPSHOT", "-RC${buildNumber}")
+    }
+    group modGroup
+    version modVersion
+    sourceCompatibility = 1.8
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -5,11 +5,6 @@ plugins {
     id "net.kyori.blossom" version "1.1.0"
 }
 
-group modGroup
-version modVersion
-
-sourceCompatibility = 1.8
-
 repositories {
     mavenCentral()
     maven { url 'https://repo.spongepowered.org/maven' }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 modGroup=rocks.milspecsg
-modVersion=1.0.0-SNAPSHOT
+modVersion=C1.0-1.0.0-SNAPSHOT
 modBaseName=MSDataSync
 
 # dependencies

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jan 31 23:47:39 CET 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
@@ -9,21 +9,15 @@ include 'MSRepository:msr-api'
 include 'MSRepository:msr-api:api-config'
 
 include 'MSRepository:msr-api:api-repository'
-include 'MSRepository:msr-api:api-repository:api-repository-mongodb'
-include 'MSRepository:msr-api:api-repository:api-repository-json'
-include 'MSRepository:msr-api:api-repository:api-repository-h2'
 include 'MSRepository:msr-api:api-repository:api-repository-mariadb'
-include 'MSRepository:msr-api:api-repository:api-repository-nitrite'
+include 'MSRepository:msr-api:api-repository:api-repository-mongodb'
 include 'MSRepository:msr-api:api-repository:api-repository-xodus'
 
 include 'MSRepository:msr-common'
 include 'MSRepository:msr-common:common-config'
 include 'MSRepository:msr-common:common-repository'
-include 'MSRepository:msr-common:common-repository:common-repository-mongodb'
-include 'MSRepository:msr-common:common-repository:common-repository-json'
-include 'MSRepository:msr-common:common-repository:common-repository-h2'
 include 'MSRepository:msr-common:common-repository:common-repository-mariadb'
-include 'MSRepository:msr-common:common-repository:common-repository-nitrite'
+include 'MSRepository:msr-common:common-repository:common-repository-mongodb'
 include 'MSRepository:msr-common:common-repository:common-repository-xodus'
 
 include 'MSRepository:msr-core'

diff --git a/sponge/build.gradle b/sponge/build.gradle
@@ -4,10 +4,7 @@ plugins {
     id 'org.spongepowered.plugin' version '0.8.1'
 }
 
-version = modVersion
-group = modGroup
-
-sourceCompatibility = 1.8
+jar.enabled = false // we only want shadowJar
 
 repositories {
     mavenCentral()
@@ -48,7 +45,9 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = "MSDataSync-Sponge-${modVersion}.jar"
+    String jarName = "MSDataSync-Sponge-${modVersion}.jar"
+    println "Building: " + jarName
+    archiveFileName = jarName
 
     dependencies {
         include project(':api')