Skip to content

Commit

Permalink
Prefix subprojects with 'smack-'
Browse files Browse the repository at this point in the history
instead of using the old baseName=smack appendix=project.name approach,
we are now going convention over configuration and renaming the
subprojects directories to the proper name.

Having a prefix is actually very helpful, because the resulting
libraries will be named like the subproject. And a core-4.0.0-rc1.jar is
not as explicit about what it actually *is* as a
smack-core-4.0.0-rc1.jar.

SMACK-265
  • Loading branch information
Flowdalic committed Apr 28, 2014
1 parent b6fb1f3 commit 91fd15a
Show file tree
Hide file tree
Showing 758 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ subprojects {
}
}

(subprojects - project(':core'))*.jar {
(subprojects - project(':smack-core'))*.jar {
manifest {
attributes('Bundle-SymbolicName': project.group + '-' + project.name,
'Fragment-Host': project.group,
Expand Down
8 changes: 0 additions & 8 deletions debug/build.gradle

This file was deleted.

22 changes: 11 additions & 11 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
include 'core',
'tcp',
'extensions',
'experimental',
'debug',
'resolver-dnsjava',
'resolver-javax',
'compression-jzlib',
'legacy',
'jingle',
'bosh'
include 'smack-core',
'smack-tcp',
'smack-extensions',
'smack-experimental',
'smack-debug',
'smack-resolver-dnsjava',
'smack-resolver-javax',
'smack-compression-jzlib',
'smack-legacy',
'smack-jingle',
'smack-bosh'
2 changes: 1 addition & 1 deletion bosh/build.gradle → smack-bosh/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repositories {
}

dependencies {
compile project(':core')
compile project(':smack-core')
compile 'org.igniterealtime.jbosh:jbosh:0.8.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Compression with jzlib
Allow to compress the XMPP stream with help of jzlib."""

dependencies {
compile project(path: ':core', configuration: 'compression')
compile project(path: ':smack-core', configuration: 'compression')
compile 'com.jcraft:jzlib:1.1.3'
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions smack-debug/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
description = """\
Smack GUI debugger.
Inspect the exchanged XMPP stanzas."""

dependencies {
compile project(':smack-core')
testCompile project(':smack-core').sourceSets.test.runtimeClasspath
}
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
6 changes: 3 additions & 3 deletions experimental/build.gradle → smack-experimental/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ otherwise carefully considered for deployment. The API may change even
between patch versions."""

dependencies {
compile project(':core')
compile project(':extensions')
testCompile project(':core').sourceSets.test.runtimeClasspath
compile project(':smack-core')
compile project(':smack-extensions')
testCompile project(':smack-core').sourceSets.test.runtimeClasspath
}
4 changes: 2 additions & 2 deletions extensions/build.gradle → smack-extensions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Classes and methods that implement support for the various XMPP XEPs
// Note that the test dependencies (junit, …) are inferred from the
// sourceSet.test of the core subproject
dependencies {
compile project(':core')
testCompile project(':core').sourceSets.test.runtimeClasspath
compile project(':smack-core')
testCompile project(':smack-core').sourceSets.test.runtimeClasspath
}
Loading

0 comments on commit 91fd15a

Please sign in to comment.