* Updated sample with 2 options to load the SDK (configure settings.g…

…radle and app/build.gradle files) : 1. Locally 2. From jCenter
aumentia · Sep 7, 2015 · eb57465 · eb57465
1 parent 073b9ab
commit eb57465
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/HelloVisualSearch/VSAumentia/VSAumentia.aar b/HelloVisualSearch/VSAumentia/VSAumentia.aar
diff --git a/HelloVisualSearch/app/build.gradle b/HelloVisualSearch/app/build.gradle
@@ -9,6 +9,7 @@ android {
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -18,6 +19,18 @@ android {
     }
     productFlavors {
     }
+
+    dexOptions {
+        incremental true
+        javaMaxHeapSize "2048M"
+    }
+
+    packagingOptions {
+        exclude 'AUTHORS'
+        exclude 'NOTICE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
 }
 
 repositories {
@@ -27,7 +40,13 @@ repositories {
 }
 
 dependencies {
+
+    compile 'com.android.support:support-v4:22.0.0'
+
+    // Option 1
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.3'
     compile project(':VSAumentia')
+
+    // Option 2
+    //compile 'VisualSearchSDK:visualsearchsdk:0.6.0'
 }
diff --git a/HelloVisualSearch/app/src/main/res/values/styles.xml b/HelloVisualSearch/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="android:Theme.Holo.Light">
         <!-- Customize your theme here. -->
     </style>
 

diff --git a/HelloVisualSearch/build.gradle b/HelloVisualSearch/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/HelloVisualSearch/settings.gradle b/HelloVisualSearch/settings.gradle
@@ -1 +1,5 @@
+// Option 1
 include ':app', ':VSAumentia'
+
+// Option 2
+//include ':app'