From c72c2884f4d017d1c8cc4f701662a28ff352b4b5 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Tue, 16 Aug 2016 18:47:22 -0400
Subject: [PATCH] Update gradle and realm to latest versions.

---
 .idea/gradle.xml                                       |  2 +-
 MiceAndMysticsTracker/build.gradle                     | 10 +---------
 .../miceandmystics/adapters/CampaignAdapter.java       |  4 ++--
 .../adapters/CampaignDetailsAdapter.java               |  8 ++++----
 .../adapters/CharacterDetailsAdapter.java              |  4 ++--
 .../miceandmystics/adapters/PlayerManagerAdapter.java  |  4 ++--
 build.gradle                                           |  3 ++-
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 8 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 58d5bbb..8d5ef9e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/MiceAndMysticsTracker/build.gradle b/MiceAndMysticsTracker/build.gradle
index 8a18f86..ed82938 100644
--- a/MiceAndMysticsTracker/build.gradle
+++ b/MiceAndMysticsTracker/build.gradle
@@ -1,12 +1,5 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-    }
-}
 apply plugin: 'com.android.application'
+apply plugin: 'realm-android'
 
 repositories {
     jcenter()
@@ -39,7 +32,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'io.realm:realm-android:0.87.0'
     compile 'uk.co.chrisjenx:calligraphy:2.0.2'
     compile 'com.android.support:recyclerview-v7:22.0.+'
     compile 'com.android.support:cardview-v7:22.0.+'
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java
index 6ecdb92..5129a6e 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java
@@ -55,9 +55,9 @@ public class CampaignAdapter extends RecyclerView.Adapter<CampaignViewHolder> {
         }
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
         for(Achievement achievement:campaign.getPartyStoryAchievements()) {
-            achievement.removeFromRealm();
+            achievement.deleteFromRealm();
         }
-        campaign.removeFromRealm();
+        campaign.deleteFromRealm();
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
         fullRefresh();
     }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
index f6b4c5f..317630e 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
@@ -88,17 +88,17 @@ public class CampaignDetailsAdapter extends RecyclerView.Adapter<RecyclerView.Vi
     public static void removeCharacterFromDB(Character character) {
         removeItemsAndAbilities(character);
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
-        character.removeFromRealm();
+        character.deleteFromRealm();
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
     }
 
     private static void removeItemsAndAbilities(Character character) {
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
         for(Ability ability:character.getAbilities()) {
-            ability.removeFromRealm();
+            ability.deleteFromRealm();
         }
         for(BackpackItem item:character.getStoredItems()) {
-            item.removeFromRealm();
+            item.deleteFromRealm();
         }
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
     }
@@ -115,7 +115,7 @@ public class CampaignDetailsAdapter extends RecyclerView.Adapter<RecyclerView.Vi
 
     public void removeAchievement(Achievement achievement) {
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
-        achievement.removeFromRealm();
+        achievement.deleteFromRealm();
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
         fullRefresh();
     }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CharacterDetailsAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CharacterDetailsAdapter.java
index b947bfa..b07e425 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CharacterDetailsAdapter.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CharacterDetailsAdapter.java
@@ -92,7 +92,7 @@ public class CharacterDetailsAdapter extends RecyclerView.Adapter<RecyclerView.V
     public void removeItem(String itemUuid) {
         BackpackItem item = MiceAndMysticsApplication.getRealmInstance().where(BackpackItem.class).equalTo("uuid",itemUuid).findFirst();
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
-        item.removeFromRealm();
+        item.deleteFromRealm();
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
         notifyDataSetChanged();
     }
@@ -100,7 +100,7 @@ public class CharacterDetailsAdapter extends RecyclerView.Adapter<RecyclerView.V
     public void removeAbility(String abilityUuid) {
         Ability ability = MiceAndMysticsApplication.getRealmInstance().where(Ability.class).equalTo("uuid",abilityUuid).findFirst();
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
-        ability.removeFromRealm();
+        ability.deleteFromRealm();
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
         notifyDataSetChanged();
     }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/PlayerManagerAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/PlayerManagerAdapter.java
index 8341cae..05fe192 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/PlayerManagerAdapter.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/PlayerManagerAdapter.java
@@ -61,7 +61,7 @@ public class PlayerManagerAdapter extends RecyclerView.Adapter<PlayerViewHolder>
                                 CampaignDetailsAdapter.removeCharacterFromDB((Character) iter.next());
                             }
                             MiceAndMysticsApplication.getRealmInstance().beginTransaction();
-                            MiceAndMysticsApplication.getRealmInstance().where(Player.class).equalTo("playerName", playerName).findFirst().removeFromRealm();
+                            MiceAndMysticsApplication.getRealmInstance().where(Player.class).equalTo("playerName", playerName).findFirst().deleteFromRealm();
                             MiceAndMysticsApplication.getRealmInstance().commitTransaction();
                             notifyDataSetChanged();
                         }
@@ -81,7 +81,7 @@ public class PlayerManagerAdapter extends RecyclerView.Adapter<PlayerViewHolder>
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
                             MiceAndMysticsApplication.getRealmInstance().beginTransaction();
-                            MiceAndMysticsApplication.getRealmInstance().where(Player.class).equalTo("playerName",playerName).findFirst().removeFromRealm();
+                            MiceAndMysticsApplication.getRealmInstance().where(Player.class).equalTo("playerName",playerName).findFirst().deleteFromRealm();
                             MiceAndMysticsApplication.getRealmInstance().commitTransaction();
                             notifyDataSetChanged();
                         }
diff --git a/build.gradle b/build.gradle
index f6e9073..faa3453 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath "io.realm:realm-gradle-plugin:1.1.1"
 
         // 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 d570517..a5ac84f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Aug 16 18:39:03 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
-- 
GitLab