Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
1.2.0
Browse files Browse the repository at this point in the history
fixed relocation and actually loads in 1.12 now
  • Loading branch information
phit committed Sep 14, 2017
1 parent 6c7d638 commit 4d519cd
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ plugins {
id 'signing'
id 'ninja.miserable.blossom' version '1.0.1'
id 'com.github.johnrengelman.shadow' version '1.2.4'
id 'org.spongepowered.plugin' version '0.6'
id 'org.spongepowered.plugin' version '0.8.1'
}

group = 'de.sldk.mc.prometheusexporter'
version = '1.1.1'
version = '1.2.0'
description = "Sponge Minecraft Prometheus Exporter"
ext.url = 'https://github.com/Stonebound/minecraft-prometheus-exporter'

Expand All @@ -27,31 +27,34 @@ repositories {
}

configurations {
compile.extendsFrom shadow

}

dependencies {
compile ("org.spongepowered:spongeapi:5.1.0")
shadow ("io.prometheus:simpleclient_common:0.0.21")
shadow ("org.eclipse.jetty:jetty-server:9.4.2.v20170220")
compile 'org.spongepowered:spongeapi:6.0.0'
compile 'io.prometheus:simpleclient_common:0.0.26'
compile 'org.eclipse.jetty:jetty-server:9.4.6.v20170531'
compile 'javax.servlet:javax.servlet-api:4.0.0'
}

shadowJar {
configurations = [project.configurations.shadow]
relocate 'org.eclipse.jetty', 'prometheus.shadow.jetty'
relocate 'io.prometheus', 'prometheus.shadow.prometheus'
relocate 'javax.servlet', 'prometheus.shadow.servlet'

configurations = [project.configurations.compile]
dependencies {
include dependency('io.prometheus:simpleclient_common:0.0.21')
include dependency('io.prometheus:simpleclient:0.0.21')
include dependency('org.eclipse.jetty:jetty-server:9.4.2.v20170220')
include dependency('org.eclipse.jetty:jetty-http:9.4.2.v20170220')
include dependency('org.eclipse.jetty:jetty-io:9.4.2.v20170220')
include dependency('org.eclipse.jetty:jetty-util:9.4.2.v20170220')
include dependency('javax.servlet:javax.servlet-api:3.1.0')
include dependency('io.prometheus:simpleclient_common:0.0.26')
include dependency('io.prometheus:simpleclient:0.0.26')
include dependency('org.eclipse.jetty:jetty-server:9.4.6.v20170531')
include dependency('org.eclipse.jetty:jetty-http:9.4.6.v20170531')
include dependency('org.eclipse.jetty:jetty-io:9.4.6.v20170531')
include dependency('org.eclipse.jetty:jetty-util:9.4.6.v20170531')
include dependency('javax.servlet:javax.servlet-api:4.0.0')
}
relocate 'org.eclipse.jetty.jetty-server', 'de.sldk.mc.relocate.jetty-server'
relocate 'org.eclipse.jetty.jetty-http', 'de.sldk.mc.relocate.jetty-http'
relocate 'org.eclipse.jetty.jetty-io', 'de.sldk.mc.relocate.jetty-io'
relocate 'org.eclipse.jetty.jetty-util', 'de.sldk.mc.relocate.jetty-util'
relocate 'javax.servlet.javax.servlet-api', 'de.sldk.mc.relocate.servlet-api'

exclude 'jetty-dir.css'
exclude 'about.html'

archiveName = "spongeprometheusexporter-${version}-plugin.jar"
}
Expand All @@ -65,7 +68,6 @@ blossom {
replaceToken '@url@', project.url, location
}

build.dependsOn(shadowJar)

signing {
if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) {
Expand Down

0 comments on commit 4d519cd

Please sign in to comment.