jni: Revert dependency on CrystaX 10.1.0 and fixes for new versions of NFD and ndn-cxx
The new CrystaX release has (yet unknown) issue that prevents code from
working properly
Change-Id: I5c34dc12ea653c7b7ec694640b5d0ecd6648b1d5
diff --git a/app/build.gradle b/app/build.gradle
index c55ce1e..41a6db8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,18 +133,21 @@
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.android.support:support-v4:21.0.3'
- compile 'net.named-data:jndn:0.4'
- compile 'net.named-data.jndn-xx:jndn-xx-util:0.0.1'
-
compile('com.intel.jndn.utils:jndn-utils:0.9.7') {
- force = true
- exclude group: 'com.intel.jndn.mock'
+ exclude group: 'com.intel.jndn.mock', module: 'jndn-mock'
+ exclude group: 'net.named-data', module: 'jndn'
}
- compile('com.intel.jndn.management:jndn-management:0.9.7') {
- force = true
- exclude group: 'com.intel.jndn.jndn-utils'
- }
- compile 'com.google.protobuf:protobuf-java:2.6.1'
+ compile('com.intel.jndn.management:jndn-management:0.9.7') {
+ exclude group: 'net.named-data', module: 'jndn'
+ exclude group: 'com.intel.jndn.utils', module: 'jndn-utils'
+ exclude group: 'com.intel.jndn.mock', module: 'jndn-mock'
+ }
+
+ // compile('net.named-data:jndn-android:0.7') {
+ compile('net.named-data:jndn:0.4') {
+ exclude group: 'org.xerial'
+ }
+ compile 'net.named-data.jndn-xx:jndn-xx-util:0.0.1'
compile 'joda-time:joda-time:2.7'
}