Skip to content

adapt to gradle 3.x collection addition using plus() #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bueli wants to merge 5 commits into
base: master
Choose a base branch
from
Open

adapt to gradle 3.x collection addition using plus() #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7923dbe
adapt to gradle 3.x collection addition using plus()
cbuehlmann Apr 19, 2017
15c08fe
use mirrors that still host old eclipse binaries
cbuehlmann Apr 19, 2017
82b02a2
use unpuzzle version 0.0.23
bueli Apr 23, 2017
a621b56
define scope for dependencies in maven pom
bueli Apr 24, 2017
6891106
Merge branch 'upgrade_to_gradle_3.x'
bueli Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ logback_version=1.1.3
projectId=wuff
projectLabels=wuff,gradle,plugin,eclipse,osgi,maven,rcp,ide
slf4j_version=1.7.7
unpuzzle_version=0.0.22
unpuzzle_version=0.0.23
version=0.0.20

15 changes: 14 additions & 1 deletion libs/publish.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,20 @@ publishing {
pom.withXml {
asNode().children().last() + configurePom
}
}

// add dependencies
pom.withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.compile.allDependencies.findAll { it.name != 'unspecified' } .each {
println 'adding dependency ' + it.name + ' to ' + project.name
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
dependencyNode.appendNode('scope', 'runtime')
}
}
}
}
}

Expand Down
2 changes: 0 additions & 2 deletions libs/wuff-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ dependencies {
compile "org.akhikhl.unpuzzle:unpuzzle-plugin:$unpuzzle_version", {
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
}
compile 'commons-io:commons-io:2.4'
compile 'commons-codec:commons-codec:1.9'
compile 'commons-configuration:commons-configuration:1.10'
}
14 changes: 7 additions & 7 deletions libs/wuff-plugin/src/main/groovy/org/akhikhl/wuff/OsgiBundleConfigurer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,27 +337,27 @@ class OsgiBundleConfigurer extends JavaConfigurer {
}

@Override
protected void createConfigurations() {
protected void createConfigurations() {
super.createConfigurations()
if(!project.configurations.findByName('publicLib')) {
Configuration configuration = project.configurations.create('publicLib')
project.sourceSets.each { it.compileClasspath += [configuration] }
project.sourceSets.each { it.compileClasspath.plus(configuration) }

if (project.plugins.hasPlugin('idea'))
project.idea.module.scopes.COMPILE.plus += [configuration]
project.idea.module.scopes.COMPILE.plus(configuration)

if (project.plugins.hasPlugin('eclipse'))
project.eclipse.classpath.plusConfigurations += [configuration]
project.eclipse.classpath.plusConfigurations.plus(configuration)
}
if(!project.configurations.findByName('privateLib')) {
Configuration configuration = project.configurations.create('privateLib')
project.sourceSets.each { it.compileClasspath += [configuration] }
project.sourceSets.each { it.compileClasspath.plus(configuration) }

if (project.plugins.hasPlugin('idea'))
project.idea.module.scopes.COMPILE.plus += [configuration]
project.idea.module.scopes.COMPILE.plus(configuration)

if (project.plugins.hasPlugin('eclipse'))
project.eclipse.classpath.plusConfigurations += [configuration]
project.eclipse.classpath.plusConfigurations.plus(configuration)
}
}

Expand Down
86 changes: 37 additions & 49 deletions libs/wuff-plugin/src/main/resources/org/akhikhl/wuff/defaultConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
wuff {

// select you mirror
// def eclipseMirror = 'http://mirror.switch.ch'

def eclipseMirror = 'http://www.eclipse.org/downloads/download.php?file='

def eclipseArchiveMirror = 'http://www.eclipse.org/downloads/download.php?file='
// old access path:
// def eclipseArchiveMirror = 'http://archive.eclipse.org'

wuffDir = new File(System.getProperty('user.home'), '.wuff')

localMavenRepositoryDir = new File(wuffDir, 'm2_repository')
Expand All @@ -9,15 +18,11 @@ wuff {
def suffix_os = [ 'linux': 'linux-gtk', 'macosx': 'macosx-cocoa', 'windows': 'win32' ]
def suffix_arch = [ 'x86_32': '', 'x86_64': '-x86_64' ]
def fileExt_os = [ 'linux': 'tar.gz', 'macosx': 'tar.gz', 'windows': 'zip' ]

eclipseVersion('3.7.1') {

eclipseMavenGroup = 'eclipse-indigo-sr1'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseArchiveMirror}/technology/epp/downloads/release/indigo/SR1/eclipse-jee-indigo-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
Expand Down Expand Up @@ -213,10 +218,6 @@ wuff {

eclipseMavenGroup = 'eclipse-indigo-sr2'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseMirror}/eclipse//technology/epp/downloads/release/indigo/SR2/eclipse-jee-indigo-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
Expand All @@ -227,17 +228,29 @@ wuff {
languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/indigo/BabelLanguagePack-rt.equinox-${language}_3.7.0.v20131123061707.zip'
}
}

eclipseVersion('3.8.0') {

extendsFrom '3.7.2'

eclipseMavenGroup = 'eclipse-juno'

sources {
source "${eclipseArchiveMirror}/technology/epp/downloads/release/juno/R/eclipse-jee-juno-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "${eclipseArchiveMirror}/eclipse/downloads/drops/R-3.8-201206081200/eclipse-SDK-3.8-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true
source "${eclipseArchiveMirror}/eclipse/downloads/drops/R-3.8-201206081200/eclipse-3.8-delta-pack.zip"

//languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/indigo/BabelLanguagePack-eclipse-${language}_3.7.0.v20131123061707.zip'
//languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/indigo/BabelLanguagePack-rt.equinox-${language}_3.7.0.v20131123061707.zip'
}
}

eclipseVersion('4.2.1') {

extendsFrom '3.7.2'

eclipseMavenGroup = 'eclipse-juno-sr1'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseArchiveMirror}/technology/epp/downloads/release/juno/SR1/eclipse-jee-juno-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
Expand Down Expand Up @@ -291,10 +304,6 @@ wuff {

eclipseMavenGroup = 'eclipse-juno-sr2'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseMirror}/eclipse//technology/epp/downloads/release/juno/SR2/eclipse-jee-juno-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
Expand All @@ -312,10 +321,6 @@ wuff {

eclipseMavenGroup = 'eclipse-kepler-sr1'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseArchiveMirror}/technology/epp/downloads/release/kepler/SR1/eclipse-jee-kepler-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
Expand All @@ -332,15 +337,11 @@ wuff {

eclipseMavenGroup = 'eclipse-kepler-sr2'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "$eclipseMirror/eclipse//technology/epp/downloads/release/kepler/SR2/eclipse-jee-kepler-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "$eclipseMirror/eclipse//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-SDK-4.3.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true
source "$eclipseMirror/eclipse//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-4.3.2-delta-pack.zip"
source "${eclipseArchiveMirror}/eclipse//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-SDK-4.3.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true
source "${eclipseArchiveMirror}//eclipse/downloads/drops4/R-4.3.2-201402211700/eclipse-4.3.2-delta-pack.zip"

languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.11.1/kepler/BabelLanguagePack-eclipse-${language}_4.3.0.v20131123020001.zip'
}
Expand All @@ -352,15 +353,11 @@ wuff {

eclipseMavenGroup = 'eclipse-luna'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "$eclipseMirror/eclipse//technology/epp/downloads/release/luna/R/eclipse-jee-luna-R-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "$eclipseArchiveMirror/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "$eclipseArchiveMirror/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-4.4-delta-pack.zip"
source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-4.4-delta-pack.zip"

languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.12.1/luna/BabelLanguagePack-eclipse-${language}_4.4.0.v20141223043836.zip'
}
Expand All @@ -385,10 +382,6 @@ wuff {

eclipseMavenGroup = 'eclipse-luna-sr1'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseMirror}/eclipse//technology/epp/downloads/release/luna/SR1/eclipse-jee-luna-SR1-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
Expand All @@ -404,15 +397,14 @@ wuff {

eclipseMavenGroup = 'eclipse-luna-sr2'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

// not available on all mirrors, but here:
eclipseMirror = 'http://mirror.switch.ch'

sources {

source "${eclipseMirror}/eclipse//technology/epp/downloads/release/luna/SR2/eclipse-jee-luna-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "${eclipseMirror}/eclipse//eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true
source "${eclipseMirror}/eclipse//eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-4.4.2-delta-pack.zip"
source "${eclipseMirror}/eclipse/technology/epp/downloads/release/luna/SR2/eclipse-jee-luna-SR2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true
source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-4.4.2-delta-pack.zip"

languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.12.1/luna/BabelLanguagePack-eclipse-${language}_4.4.0.v20141223043836.zip'
}
Expand All @@ -424,14 +416,10 @@ wuff {

eclipseMavenGroup = 'eclipse-mars'

eclipseMirror = 'http://mirror.netcologne.de'

eclipseArchiveMirror = 'http://archive.eclipse.org'

sources {

source "${eclipseMirror}/eclipse//technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}"
source "${eclipseMirror}/eclipse//eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true
source "${eclipseArchiveMirror}/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-${suffix_os[current_os]}${suffix_arch[current_arch]}.${fileExt_os[current_os]}", sourcesOnly: true

languagePackTemplate '${eclipseMirror}/eclipse//technology/babel/babel_language_packs/R0.13.0/mars/BabelLanguagePack-eclipse-${language}_4.5.0.v20150804081228.zip'
}
Expand Down