Skip to content

Commit a5fc377

Browse files
committed
Fix scope of core project for third party integration.
1 parent 46b0351 commit a5fc377

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

SkyChanger-Bukkit/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'net.minecrell.plugin-yml.bukkit' version '0.3.0'
3+
id 'java-library'
34
}
45

56
repositories {
@@ -12,7 +13,7 @@ repositories {
1213
dependencies {
1314
compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT'
1415

15-
implementation project(':SkyChanger-Core')
16+
api project(':SkyChanger-Core')
1617
implementation 'org.bstats:bstats-bukkit:1.7'
1718
}
1819

SkyChanger-Sponge/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ buildscript {
1111
plugins {
1212
id 'org.spongepowered.plugin' version '0.9.0'
1313
id 'net.minecrell.vanillagradle.server' version '2.2-6'
14+
id 'java-library'
1415
}
1516

1617
minecraft {
@@ -38,7 +39,7 @@ repositories {
3839
dependencies {
3940
compileOnly 'org.spongepowered:spongeapi:7.1.0'
4041

41-
implementation project(':SkyChanger-Core')
42+
api project(':SkyChanger-Core')
4243
implementation 'org.bstats:bstats-sponge:1.7'
4344
}
4445

build.gradle

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'net.minecrell.licenser' version '0.4.1'
3-
id 'com.github.johnrengelman.shadow' version '4.0.3'
4-
id 'com.jfrog.bintray' version '1.8.4'
3+
id 'com.github.johnrengelman.shadow' version '4.0.1'
4+
id 'com.jfrog.bintray' version '1.8.3'
55
}
66

77
allprojects {
@@ -31,10 +31,20 @@ subprojects {
3131

3232
def major = '3'
3333
def minor = '1'
34-
def spongeRevision = '0'
35-
def bukkitRevision = '0'
34+
def spongeRevision = '1'
35+
def bukkitRevision = '1'
3636

37-
version = "${major}.${minor}.${project.name.endsWith('Sponge') ? spongeRevision : bukkitRevision}"
37+
def rev
38+
39+
if (project.name.endsWith('Sponge')) {
40+
rev = spongeRevision
41+
} else if (project.name.endsWith('Bukkit')) {
42+
rev = bukkitRevision
43+
} else {
44+
rev = spongeRevision.toInteger() > bukkitRevision.toInteger() ? spongeRevision : bukkitRevision
45+
}
46+
47+
version = "${major}.${minor}.${rev}"
3848

3949
tasks.withType(JavaCompile) {
4050
options.encoding = 'UTF-8'

0 commit comments

Comments
 (0)