Fix scope of core project for third party integration.

dscalzi · Feb 25, 2020 · a5fc377 · a5fc377
1 parent 46b0351
commit a5fc377
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/SkyChanger-Bukkit/build.gradle b/SkyChanger-Bukkit/build.gradle
@@ -1,5 +1,6 @@
 plugins {
 	id 'net.minecrell.plugin-yml.bukkit' version '0.3.0'
+    id 'java-library'
 }
 
 repositories {
@@ -12,7 +13,7 @@ repositories {
 dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT'
 
-    implementation project(':SkyChanger-Core')
+    api project(':SkyChanger-Core')
     implementation 'org.bstats:bstats-bukkit:1.7'
 }
 

diff --git a/SkyChanger-Sponge/build.gradle b/SkyChanger-Sponge/build.gradle
@@ -11,6 +11,7 @@ buildscript {
 plugins {
     id 'org.spongepowered.plugin' version '0.9.0'
     id 'net.minecrell.vanillagradle.server' version '2.2-6'
+    id 'java-library'
 }
 
 minecraft {
@@ -38,7 +39,7 @@ repositories {
 dependencies {
     compileOnly 'org.spongepowered:spongeapi:7.1.0'
 
-    implementation project(':SkyChanger-Core')
+    api project(':SkyChanger-Core')
     implementation 'org.bstats:bstats-sponge:1.7'
 }
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'net.minecrell.licenser' version '0.4.1'
-    id 'com.github.johnrengelman.shadow' version '4.0.3'
-    id 'com.jfrog.bintray' version '1.8.4'
+    id 'com.github.johnrengelman.shadow' version '4.0.1'
+    id 'com.jfrog.bintray' version '1.8.3'
 }
 
 allprojects {
@@ -31,10 +31,20 @@ subprojects {
 
     def major = '3'
     def minor = '1'
-    def spongeRevision = '0'
-    def bukkitRevision = '0'
+    def spongeRevision = '1'
+    def bukkitRevision = '1'
 
-    version = "${major}.${minor}.${project.name.endsWith('Sponge') ? spongeRevision : bukkitRevision}"
+    def rev
+
+    if (project.name.endsWith('Sponge')) {
+        rev = spongeRevision
+    } else if (project.name.endsWith('Bukkit')) {
+        rev = bukkitRevision
+    } else {
+        rev = spongeRevision.toInteger() > bukkitRevision.toInteger() ? spongeRevision : bukkitRevision
+    }
+
+    version = "${major}.${minor}.${rev}"
 
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'