adding netcipher to build scripts; fix a few gradle dupe issues

scalio · Dec 28, 2014 · f570c7d · f570c7d
1 parent 12ef898
commit f570c7d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "external/SecureShareLib"]
 	path = external/SecureShareLib
 	url = https://github.com/scalio/SecureShareLib.git
+[submodule "external/NetCipher"]
+	path = external/NetCipher
+	url = https://github.com/scalio/NetCipher.git
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,17 +7,27 @@ android {
 
     defaultConfig {
         applicationId "io.scal.openarchive"
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'LICENSE.txt'
+    }
 }
 
 dependencies {
@@ -29,6 +39,7 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp:2.1.0'
     compile 'com.squareup.okio:okio:1.1.0'
     compile project(':external:SecureShareLib:SecureShareUILibrary')
+    compile project(':external:NetCipher:libnetcipher')
 }
 
 apt {

diff --git a/external/netcipher b/external/netcipher
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,4 @@
 include ':app'
 include ':external:SecureShareLib:SecureShareUILibrary'
-include ':external:SecureShareLib:SecureShareUILibrary:external:facebook-sdk:facebook'
+include ':external:SecureShareLib:SecureShareUILibrary:external:facebook-sdk:facebook'
+include ':external:NetCipher:libnetcipher'