Update project dependencies and add placeholders for SDK files.

.gitignore

@@ -18,6 +18,8 @@ build/
 /*/build/
 
 # Local configuration file (sdk path, etc)
+affdexme-android.iml
+gradle.properties
 local.properties
 
 # Proguard folder generated by Eclipse

app/.gitignore

@@ -1 +1,8 @@
+/app.iml
 /build
+/jniLibs/armeabi-v7a
+/libs/Affdex-sdk.jar
+/libs/Affdex-sdk-javadoc.jar
+/src/main/assets/Affdex/*.license
+/src/main/assets/Affdex/Classifiers
+/src/main/assets/Affdex/Classifiers/v_9

app/app.iml

@@ -36,13 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -64,34 +64,25 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="dagger-1.2.2" level="project" />
-    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="Affdex-sdk" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
+    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="Affdex-sdk-javadoc" level="project" />
-    <orderEntry type="library" exported="" name="flurry-analytics-4.1.0" level="project" />
   </component>
 </module>

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 23
-    buildToolsVersion '22.0.1'
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         applicationId "com.affectiva.affdexme"
-        minSdkVersion 16
+        minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
-        versionCode 14
+        versionCode 15
-        versionName "2.0.0"
+        versionName "2.1.0"
         setProperty("archivesBaseName", "AffdexMe-$versionName-$versionCode")
     }
     buildTypes {
@@ -23,30 +23,38 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
     sourceSets {
         main {
-            jniLibs.srcDirs = ['native-libs']
+            jniLibs.srcDirs = ['jniLibs']
             jni.srcDirs = [] //disable automatic ndk-build
         }
     }
 }
 
 dependencies {
-	//gson is necessary for the license to be parsed
+    //include the Affdex SDK jars
-    compile 'com.google.code.gson:gson:2.3'
-	
-	//include the Affdex SDK jars
     compile files('libs/Affdex-sdk.jar')
     compile files('libs/Affdex-sdk-javadoc.jar')
-    compile files('libs/dagger-1.2.2.jar')
-    compile files('libs/flurry-analytics-4.1.0.jar')
-    compile files('libs/javax.inject-1.jar')
 
-	//although the use of the CameraDetector class in this project does not require it, you may have to include
+    //include dependencies
-	//the following dependencies if you use other features of the Affdex SDK
+    compile 'com.squareup.dagger:dagger:1.2.2'
-	//compile 'com.android.support:support-v4:22.2.0'
+    compile 'javax.inject:javax.inject:1'
-    //compile 'com.google.android.gms:play-services:7.5.0'
 
+    //although the use of the CameraDetector class in this project does not require it, you may have to include
+    //the following dependencies if you use other features of the Affdex SDK
+//    compile 'com.google.code.gson:gson:2.4'
+//    compile 'com.android.support:support-v4:23.1.1'
+//    compile 'com.android.support:appcompat-v7:23.1.1'
+//    compile 'com.android.support:support-v13:23.1.1'
+//    compile 'com.google.android.gms:play-services:8.4.0'
+//    compile 'com.google.android.gms:play-services-ads:8.4.0'
+//    compile 'com.google.android.gms:play-services-identity:8.4.0'
+//    compile 'com.google.android.gms:play-services-gcm:8.4.0'
+//    compile files('libs/flurry-analytics-5.0.0.jar')
 }
 
 // build a signed release apk only if the environment is configured

app/jniLibs/READ.ME

@@ -0,0 +1,3 @@
+Place the native library files here.
+
+amreabi-v7a/libaffdexface_jni.so

app/libs/READ.ME

@@ -0,0 +1,4 @@
+Place the Affdex SDK JARs here.
+
+Affdex-sdk.jar
+Affdex-sdk-javadoc.jar

app/src/main/AndroidManifest.xml

@@ -2,10 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.affectiva.affdexme" >
 
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="22" />
-
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
@@ -15,7 +11,7 @@
 
     <application
         android:name="com.affectiva.errorreporting.CustomApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:hardwareAccelerated="true"
         android:label="@string/app_name">

app/src/main/assets/Affdex/READ.ME

@@ -0,0 +1,12 @@
+Place license file and Classifiers folder here.
+
+xxxxxx.license
+Classifiers
+Classifiers/v_9
+Classifiers/v_9/face_model_3d.bin
+Classifiers/v_9/CT_pack/*
+Classifiers/v_9/haarcascade/*
+Classifiers/v_9/new_pack/*
+Classifiers/v_9/noctali0.83/*
+Classifiers/v_9/PA_pack/*
+Classifiers/v_9/production_config/*

app/src/main/java/com/affectiva/affdexme/MainActivity.java

@@ -246,7 +246,8 @@ public class MainActivity extends Activity
         detector = new CameraDetector(this, CameraDetector.CameraType.CAMERA_FRONT, cameraView);
 
 		// update the license path here if you name your file something else
-        detector.setLicensePath("license.txt");
+//        detector.setLicensePath("license.txt");
+        detector.setLicensePath("Affectiva.license");
         detector.setImageListener(this);
         detector.setFaceListener(this);
         detector.setOnCameraEventListener(this);

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Oct 21 11:34:03 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip

gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`