Permalink
Browse files

Revert build changes for now

  • Loading branch information...
eugener committed Sep 11, 2014
1 parent 4026b4c commit 6c93aca5487300f77be02227ef651831c7c58e1d
Showing with 17 additions and 20 deletions.
  1. +9 −11 controlsfx/build.gradle
  2. +8 −9 mavenPublish.gradle
@@ -1,16 +1,21 @@

dependencies {
compile 'org.controlsfx:openjfx-dialogs:1.0.1'
compile localGroovy()
compile('org.codehaus.groovy.modules.http-builder:http-builder:0.7.1') {
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
exclude group: 'org.codehaus.groovy', module: 'groovy'
}
compile 'org.controlsfx:openjfx-dialogs:1.0.1'
try {
jdk files(jfxrtJar)
} catch (MissingPropertyException pne) {
// javafx plugin will provide in this case
}
}

ext {
pomExclusions = ['http-builder']
}
//ext {
// pomExclusions = ['http-builder']
//}


test {
@@ -44,13 +49,6 @@ sourceSets {
}
}

dependencies {
try {
jdk files(jfxrtJar)
} catch (MissingPropertyException pne) {
// javafx plugin will provide in this case
}
}

task downloadTranslations << {
description = "Download translations from Transifex"
@@ -46,13 +46,12 @@ install {
configuration = configurations.published
}

ext {
pomExclusions = []
}
//ext {
// pomExclusions = []
//}

private configurePOM(def pom) {
pom{
project {
pom.project {
name 'ControlsFX'
description 'High quality UI controls and other tools to complement the core JavaFX distribution'
url 'http://www.controlsfx.org/'
@@ -84,10 +83,10 @@ private configurePOM(def pom) {
//project.build.sourceEncoding='UTF-8'
setProperty('project.build.sourceEncoding', 'UTF8')
}
}
whenConfigured{
dependencies = dependencies.findAll {dep -> !pomExclusions.contains(dep.artifactId) }
}
//}
//whenConfigured{
// dependencies = dependencies.findAll {dep -> !pomExclusions.contains(dep.artifactId) }
//}

}
}

0 comments on commit 6c93aca

Please sign in to comment.