vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-25 05:22:06 +01:00
Code Issues Releases Wiki Activity

Don't let smack-android depend on smack-omemo(-signal)

Browse source 
Fixes SMACK-779.
This commit is contained in:
Florian Schmaus 2017-10-27 20:54:06 +02:00
parent 1b2521269e
commit 1d52a0c8ef
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -79,6 +79,14 @@ allprojects {
':smack-android', ':smack-android',
':smack-android-extensions', ':smack-android-extensions',
].collect{ project(it) } ].collect{ project(it) }
androidOptionalProjects = [
':smack-tcp',
':smack-extensions',
':smack-experimental',
':smack-bosh',
':smack-omemo',
':smack-omemo-signal',
].collect{ project(it) }
gplLicensedProjects = [ gplLicensedProjects = [
':smack-omemo-signal', ':smack-omemo-signal',
':smack-omemo-signal-integration-test', ':smack-omemo-signal-integration-test',

5
smack-android/build.gradle
View file

@ -9,9 +9,8 @@ smack-extensions and smack-experimental."""
dependencies { dependencies {
// androidProjects lists all projects that are checked to compile against android.jar // androidProjects lists all projects that are checked to compile against android.jar
// Filter out the optional Smack dependencies from androidProjects // Filter out the optional Smack dependencies from androidProjects
androidProjects.findAll { (androidProjects - androidOptionalProjects)
![':smack-tcp', ':smack-extensions', ':smack-experimental', ':smack-bosh'].contains(it.getPath()) .each { project ->
}.each { project ->
compile project compile project
} }