From 9ef453c1694098c2f0ee1e3d1dfe452495166db5 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Thu, 18 Aug 2016 18:57:29 -0400 Subject: [PATCH] replace deprecated calls to setAllAppearance with setAllAppearances updated gradle version while I was at it, at Android Studio's suggestion. --- app/src/main/java/com/affectiva/affdexme/MainActivity.java | 6 +++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/affectiva/affdexme/MainActivity.java b/app/src/main/java/com/affectiva/affdexme/MainActivity.java index d49879e..8cacdfd 100644 --- a/app/src/main/java/com/affectiva/affdexme/MainActivity.java +++ b/app/src/main/java/com/affectiva/affdexme/MainActivity.java @@ -510,10 +510,10 @@ public class MainActivity extends AppCompatActivity } if (sharedPreferences.getBoolean("appearance", drawingView.getDrawAppearanceMarkersEnabled())) { - detector.setDetectAllAppearance(true); + detector.setDetectAllAppearances(true); setShowAppearance(true); } else { - detector.setDetectAllAppearance(false); + detector.setDetectAllAppearances(false); setShowAppearance(false); } @@ -881,7 +881,7 @@ public class MainActivity extends AppCompatActivity detector.setDetectAllEmotions(false); detector.setDetectAllExpressions(false); - detector.setDetectAllAppearance(false); + detector.setDetectAllAppearances(false); detector.setDetectAllEmojis(false); } diff --git a/build.gradle b/build.gradle index 2a5715a..63ff522 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8e05642..a298ead 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 13 11:17:14 EDT 2016 +#Thu Aug 18 18:52:23 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip