Update to realm 0.87.2 (issue PhilJay#1397)

PhilJay · PhilJay · commit 8acc87da75bf · 2016-01-24T13:23:52.000+01:00
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -25,7 +25,6 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-
     }
 
     lintOptions {
@@ -55,6 +54,6 @@ dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':MPChartLib') // remove this if you only imported the example project
     compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'io.realm:realm-android:0.84.0-SNAPSHOT' // dependency for realm-database API (http://realm.io)
+    compile 'io.realm:realm-android:0.87.2' // dependency for realm-database API (http://realm.io)
     //compile 'com.github.PhilJay:MPAndroidChart:v2.2.0'
 }
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RealmFloat.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/custom/RealmFloat.java
@@ -21,7 +21,7 @@ public float getFloatValue() {
         return floatValue;
     }
 
-    public void setFloatValue(float value) {
+    public void setFloatValue(Float value) {
         this.floatValue = value;
     }
 }
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
@@ -41,7 +41,7 @@ repositories {
 dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     //compile 'com.android.support:support-v4:19.+'
-    provided 'io.realm:realm-android:0.84.1-SNAPSHOT' // "optional" dependency to realm-database API
+    provided 'io.realm:realm-android:0.87.2' // "optional" dependency to realm-database API
 }
 
 android.libraryVariants.all { variant ->
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmBarLineScatterCandleBubbleDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmBarLineScatterCandleBubbleDataSet.java
@@ -16,7 +16,6 @@ public abstract class RealmBarLineScatterCandleBubbleDataSet<T extends RealmObje
     /** default highlight color */
     protected int mHighLightColor = Color.rgb(255, 187, 115);
 
-
     public RealmBarLineScatterCandleBubbleDataSet(RealmResults<T> results, String yValuesField) {
         super(results, yValuesField);
     }
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmBaseDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmBaseDataSet.java
@@ -9,6 +9,7 @@
 
 import io.realm.RealmObject;
 import io.realm.RealmResults;
+import io.realm.Sort;
 
 /**
  * Created by Philipp Jahoda on 06/11/15.
@@ -51,7 +52,7 @@ public RealmBaseDataSet(RealmResults<T> results, String yValuesField) {
         this.mValues = new ArrayList<S>();
 
         if (mIndexField != null)
-            this.results.sort(mIndexField, true);
+            this.results.sort(mIndexField, Sort.ASCENDING);
     }
 
     /**
@@ -68,7 +69,7 @@ public RealmBaseDataSet(RealmResults<T> results, String yValuesField, String xIn
         this.mValues = new ArrayList<S>();
 
         if (mIndexField != null)
-            this.results.sort(mIndexField, true);
+            this.results.sort(mIndexField, Sort.ASCENDING);
     }
 
     /**
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmLineRadarDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmLineRadarDataSet.java
@@ -6,9 +6,9 @@
 import com.github.mikephil.charting.interfaces.datasets.ILineRadarDataSet;
 import com.github.mikephil.charting.utils.Utils;
 
+import io.realm.DynamicRealmObject;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 08/11/15.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmUtils.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/base/RealmUtils.java
@@ -3,10 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.realm.DynamicRealmObject;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
-
 /**
  * Created by Philipp Jahoda on 19/12/15.
  */
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmBarDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmBarDataSet.java
@@ -6,10 +6,10 @@
 import com.github.mikephil.charting.data.realm.base.RealmBarLineScatterCandleBubbleDataSet;
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
 
+import io.realm.DynamicRealmObject;
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmList;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 07/11/15.
@@ -85,7 +85,7 @@ public void build(RealmResults<T> results) {
 
             } catch (IllegalArgumentException e) {
 
-                DynamicRealmList list = dynamicObject.getList(mValuesField);
+                RealmList<DynamicRealmObject> list = dynamicObject.getList(mValuesField);
                 float[] values = new float[list.size()];
 
                 int i = 0;
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmBubbleDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmBubbleDataSet.java
@@ -1,15 +1,13 @@
 package com.github.mikephil.charting.data.realm.implementation;
 
-import android.graphics.Color;
-
 import com.github.mikephil.charting.data.BubbleEntry;
 import com.github.mikephil.charting.data.realm.base.RealmBarLineScatterCandleBubbleDataSet;
 import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet;
 import com.github.mikephil.charting.utils.Utils;
 
+import io.realm.DynamicRealmObject;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 07/11/15.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmCandleDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmCandleDataSet.java
@@ -8,9 +8,9 @@
 import com.github.mikephil.charting.utils.ColorTemplate;
 import com.github.mikephil.charting.utils.Utils;
 
+import io.realm.DynamicRealmObject;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 07/11/15.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmLineDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmLineDataSet.java
@@ -4,7 +4,6 @@
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 
-import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.data.realm.base.RealmLineRadarDataSet;
 import com.github.mikephil.charting.formatter.DefaultFillFormatter;
 import com.github.mikephil.charting.formatter.FillFormatter;
@@ -17,7 +16,6 @@
 
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 21/10/15.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmPieDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmPieDataSet.java
@@ -5,9 +5,9 @@
 import com.github.mikephil.charting.interfaces.datasets.IPieDataSet;
 import com.github.mikephil.charting.utils.Utils;
 
+import io.realm.DynamicRealmObject;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 07/11/15.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmRadarDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmRadarDataSet.java
@@ -1,12 +1,10 @@
 package com.github.mikephil.charting.data.realm.implementation;
 
-import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.data.realm.base.RealmLineRadarDataSet;
 import com.github.mikephil.charting.interfaces.datasets.IRadarDataSet;
 
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 07/11/15.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmScatterDataSet.java b/MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmScatterDataSet.java
@@ -6,9 +6,9 @@
 import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet;
 import com.github.mikephil.charting.utils.Utils;
 
+import io.realm.DynamicRealmObject;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
-import io.realm.dynamic.DynamicRealmObject;
 
 /**
  * Created by Philipp Jahoda on 07/11/15.

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ android {`
`25`	`25`	`minifyEnabled false`
`26`	`26`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`27`	`27`	`}`
`28`		`-`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`lintOptions {`
`@@ -55,6 +54,6 @@ dependencies {`
`55`	`54`	`//compile fileTree(dir: 'libs', include: ['*.jar'])`
`56`	`55`	`compile project(':MPChartLib') // remove this if you only imported the example project`
`57`	`56`	`compile 'com.android.support:appcompat-v7:23.1.1'`
`58`		`- compile 'io.realm:realm-android:0.84.0-SNAPSHOT' // dependency for realm-database API (http://realm.io)`
	`57`	`+ compile 'io.realm:realm-android:0.87.2' // dependency for realm-database API (http://realm.io)`
`59`	`58`	`//compile 'com.github.PhilJay:MPAndroidChart:v2.2.0'`
`60`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public float getFloatValue() {`
`21`	`21`	`return floatValue;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public void setFloatValue(float value) {`
	`24`	`+ public void setFloatValue(Float value) {`
`25`	`25`	`this.floatValue = value;`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ repositories {`
`41`	`41`	`dependencies {`
`42`	`42`	`//compile fileTree(dir: 'libs', include: ['*.jar'])`
`43`	`43`	`//compile 'com.android.support:support-v4:19.+'`
`44`		`- provided 'io.realm:realm-android:0.84.1-SNAPSHOT' // "optional" dependency to realm-database API`
	`44`	`+ provided 'io.realm:realm-android:0.87.2' // "optional" dependency to realm-database API`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`android.libraryVariants.all { variant ->`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public abstract class RealmBarLineScatterCandleBubbleDataSet<T extends RealmObje`
`16`	`16`	`/** default highlight color */`
`17`	`17`	`protected int mHighLightColor = Color.rgb(255, 187, 115);`
`18`	`18`
`19`		`-`
`20`	`19`	`public RealmBarLineScatterCandleBubbleDataSet(RealmResults<T> results, String yValuesField) {`
`21`	`20`	`super(results, yValuesField);`
`22`	`21`	`}`