From ee5589c12aa89e2f948cf077e9adfd434d27357c Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 08:50:26 +0100 Subject: [PATCH 01/11] Update greendao to 2.1.0. --- greenDAO-generator/build.gradle | 2 +- greenDAO/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/greenDAO-generator/build.gradle b/greenDAO-generator/build.gradle index eb4507e..adf8c6c 100644 --- a/greenDAO-generator/build.gradle +++ b/greenDAO-generator/build.gradle @@ -9,5 +9,5 @@ sourceSets { } dependencies { - compile 'de.greenrobot:greendao-generator:2.0.0' + compile 'de.greenrobot:greendao-generator:2.1.0' } diff --git a/greenDAO/build.gradle b/greenDAO/build.gradle index fc7f610..5494309 100644 --- a/greenDAO/build.gradle +++ b/greenDAO/build.gradle @@ -38,5 +38,5 @@ android { dependencies { androidTestCompile project(':Common') - androidTestCompile 'de.greenrobot:greendao:2.0.0' + androidTestCompile 'de.greenrobot:greendao:2.1.0' } From cb60ccb228c6d9ee11a01b7408b8d2cafd9bccd3 Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 09:07:52 +0100 Subject: [PATCH 02/11] Rename to PerfTestActiveAndroid. - Add note about ceased development. --- ...nceTestActiveAndroid.java => PerfTestActiveAndroid.java} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/{PerformanceTestActiveAndroid.java => PerfTestActiveAndroid.java} (97%) diff --git a/ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/PerformanceTestActiveAndroid.java b/ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/PerfTestActiveAndroid.java similarity index 97% rename from ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/PerformanceTestActiveAndroid.java rename to ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/PerfTestActiveAndroid.java index 525f831..4eda23b 100644 --- a/ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/PerformanceTestActiveAndroid.java +++ b/ActiveAndroid/src/androidTest/java/de/greenrobot/performance/activeandroid/PerfTestActiveAndroid.java @@ -12,15 +12,17 @@ import java.util.List; /** + * Note: looks like development has ceased. Last commit on 2014-10-07. + * * https://github.com/pardom/ActiveAndroid/wiki/Getting-started */ -public class PerformanceTestActiveAndroid extends BasePerfTestCase { +public class PerfTestActiveAndroid extends BasePerfTestCase { private static final String DATABASE_NAME = "active-android.db"; @Override protected String getLogTag() { - return "PerfTestActiveAndroid"; + return getClass().getSimpleName(); } @Override From 544cc13c18d9ab5d32789677cbc64549cc983aad Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 09:53:18 +0100 Subject: [PATCH 03/11] Update cupboard to 2.1.4. - No release notes :( --- Cupboard/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cupboard/build.gradle b/Cupboard/build.gradle index dff6e15..35ae353 100644 --- a/Cupboard/build.gradle +++ b/Cupboard/build.gradle @@ -21,5 +21,5 @@ android { dependencies { androidTestCompile project(':Common') - androidTestCompile 'nl.qbusict:cupboard:2.1.2' + androidTestCompile 'nl.qbusict:cupboard:2.1.4' } From 98829d0cb414fcdde3b6e7a4be9a797e6a3a5ce4 Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 09:54:04 +0100 Subject: [PATCH 04/11] Rename to PerfTestCupboard. - Update help link. --- .../{PerformanceTestCupboard.java => PerfTestCupboard.java} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/{PerformanceTestCupboard.java => PerfTestCupboard.java} (97%) diff --git a/Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/PerformanceTestCupboard.java b/Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/PerfTestCupboard.java similarity index 97% rename from Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/PerformanceTestCupboard.java rename to Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/PerfTestCupboard.java index 533ef0f..5dc6338 100644 --- a/Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/PerformanceTestCupboard.java +++ b/Cupboard/src/androidTest/java/de/greenrobot/performance/cupboard/PerfTestCupboard.java @@ -14,9 +14,9 @@ import nl.qbusict.cupboard.DatabaseCompartment; /** - * https://bitbucket.org/qbusict/cupboard/wiki/GettingStarted + * https://bitbucket.org/littlerobots/cupboard/wiki/GettingStarted */ -public class PerformanceTestCupboard extends BasePerfTestCase { +public class PerfTestCupboard extends BasePerfTestCase { private static final String DATABASE_NAME = "cupboard.db"; private static final int DATABASE_VERSION = 1; @@ -25,7 +25,7 @@ public class PerformanceTestCupboard extends BasePerfTestCase { @Override protected String getLogTag() { - return "PerfTestCupboard"; + return getClass().getSimpleName(); } @Override From 7f4a5e82d66ec9f23f205412f7a5513ab6ab595a Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:03:57 +0100 Subject: [PATCH 05/11] Update firebase-client-android to 2.5.1. - https://www.firebase.com/docs/android/changelog.html --- Firebase/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firebase/build.gradle b/Firebase/build.gradle index 8aeaadd..e20b58c 100644 --- a/Firebase/build.gradle +++ b/Firebase/build.gradle @@ -27,5 +27,5 @@ android { dependencies { androidTestCompile project(':Common') - androidTestCompile 'com.firebase:firebase-client-android:2.3.1' + androidTestCompile 'com.firebase:firebase-client-android:2.5.1' } From fdcb04c21030f47fb98cb6030fa7ccb0244bb61c Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:04:09 +0100 Subject: [PATCH 06/11] Rename to PerfTestFirebase. --- .../{PerformanceTestFirebase.java => PerfTestFirebase.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename Firebase/src/androidTest/java/de/greenrobot/performance/firebase/{PerformanceTestFirebase.java => PerfTestFirebase.java} (98%) diff --git a/Firebase/src/androidTest/java/de/greenrobot/performance/firebase/PerformanceTestFirebase.java b/Firebase/src/androidTest/java/de/greenrobot/performance/firebase/PerfTestFirebase.java similarity index 98% rename from Firebase/src/androidTest/java/de/greenrobot/performance/firebase/PerformanceTestFirebase.java rename to Firebase/src/androidTest/java/de/greenrobot/performance/firebase/PerfTestFirebase.java index 988a2a3..cc9a84b 100644 --- a/Firebase/src/androidTest/java/de/greenrobot/performance/firebase/PerformanceTestFirebase.java +++ b/Firebase/src/androidTest/java/de/greenrobot/performance/firebase/PerfTestFirebase.java @@ -26,14 +26,14 @@ * * https://www.firebase.com/docs/android/guide/ */ -public class PerformanceTestFirebase extends BasePerfTestCase { +public class PerfTestFirebase extends BasePerfTestCase { private Firebase rootFirebaseRef; private List reloaded; @Override protected String getLogTag() { - return "PerfTestFirebase"; + return getClass().getSimpleName(); } @Override From bdc54256216194b000f2eef9bcb76e1b3e14f7de Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:26:37 +0100 Subject: [PATCH 07/11] Update parse-android to 1.13.0. - https://github.com/ParsePlatform/Parse-SDK-Android/releases/tag/1.13.0 --- Parse/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Parse/build.gradle b/Parse/build.gradle index 8f7ac94..81fc865 100644 --- a/Parse/build.gradle +++ b/Parse/build.gradle @@ -28,7 +28,6 @@ android { dependencies { androidTestCompile project(':Common') - compile 'com.parse.bolts:bolts-android:1.2.1' - compile 'com.parse:parse-android:1.10.2' + compile 'com.parse:parse-android:1.13.0' } From 9d772dea94a8998fa2623122473c0be16bf15dcc Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:26:49 +0100 Subject: [PATCH 08/11] Rename to PerfTestParse. --- .../parse/{PerformanceTestParse.java => PerfTestParse.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename Parse/src/androidTest/java/de/greenrobot/performance/parse/{PerformanceTestParse.java => PerfTestParse.java} (98%) diff --git a/Parse/src/androidTest/java/de/greenrobot/performance/parse/PerformanceTestParse.java b/Parse/src/androidTest/java/de/greenrobot/performance/parse/PerfTestParse.java similarity index 98% rename from Parse/src/androidTest/java/de/greenrobot/performance/parse/PerformanceTestParse.java rename to Parse/src/androidTest/java/de/greenrobot/performance/parse/PerfTestParse.java index f3fe62a..d284b4a 100644 --- a/Parse/src/androidTest/java/de/greenrobot/performance/parse/PerformanceTestParse.java +++ b/Parse/src/androidTest/java/de/greenrobot/performance/parse/PerfTestParse.java @@ -15,14 +15,14 @@ /** * https://parse.com/docs/android/guide */ -public class PerformanceTestParse extends BasePerfTestCase { +public class PerfTestParse extends BasePerfTestCase { // reduced query count due to slow performance private static final int QUERY_COUNT = 100; @Override protected String getLogTag() { - return "PerfTestParse"; + return getClass().getSimpleName(); } @Override From 4f7afbc018b172d8c85ec10f1faa628a8ec10b28 Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:43:25 +0100 Subject: [PATCH 09/11] Update realm to 0.88.0. - https://github.com/realm/realm-java/blob/master/CHANGELOG.md --- Realm/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Realm/build.gradle b/Realm/build.gradle index e0d33a7..4821a8a 100644 --- a/Realm/build.gradle +++ b/Realm/build.gradle @@ -1,10 +1,14 @@ buildscript { dependencies { classpath dep.androidPlugin + classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'io.realm:realm-gradle-plugin:0.88.0' } } apply plugin: 'com.android.application' +apply plugin: 'com.neenbedankt.android-apt' +apply plugin: 'realm-android' android { buildToolsVersion rootProject.ext.buildToolsVersion @@ -12,7 +16,7 @@ android { defaultConfig { applicationId 'de.greenrobot.performance.realm' - minSdkVersion rootProject.ext.minSdkVersion + minSdkVersion 9 targetSdkVersion rootProject.ext.targetSdkVersion testInstrumentationRunner 'android.test.InstrumentationTestRunner' @@ -21,5 +25,4 @@ android { dependencies { androidTestCompile project(':Common') - androidTestCompile 'io.realm:realm-android:0.82.2' } From 325f67656417475f3933366f0ce56f703f2b4858 Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:43:41 +0100 Subject: [PATCH 10/11] Rename to PerfTestRealm. --- .../realm/{PerformanceTestRealm.java => PerfTestRealm.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename Realm/src/androidTest/java/de/greenrobot/performance/realm/{PerformanceTestRealm.java => PerfTestRealm.java} (98%) diff --git a/Realm/src/androidTest/java/de/greenrobot/performance/realm/PerformanceTestRealm.java b/Realm/src/androidTest/java/de/greenrobot/performance/realm/PerfTestRealm.java similarity index 98% rename from Realm/src/androidTest/java/de/greenrobot/performance/realm/PerformanceTestRealm.java rename to Realm/src/androidTest/java/de/greenrobot/performance/realm/PerfTestRealm.java index 4ec1abb..2169902 100644 --- a/Realm/src/androidTest/java/de/greenrobot/performance/realm/PerformanceTestRealm.java +++ b/Realm/src/androidTest/java/de/greenrobot/performance/realm/PerfTestRealm.java @@ -15,7 +15,7 @@ /** * https://realm.io/docs/java/latest/ https://github.com/realm/realm-java/ */ -public class PerformanceTestRealm extends BasePerfTestCase { +public class PerfTestRealm extends BasePerfTestCase { private boolean inMemory = false; @@ -23,7 +23,7 @@ public class PerformanceTestRealm extends BasePerfTestCase { @Override protected String getLogTag() { - return "PerfTestRealm"; + return getClass().getSimpleName(); } @Override From e7ea514f4245112c8a5ee95fb4111dcae097f143 Mon Sep 17 00:00:00 2001 From: greenrobot Team Date: Mon, 14 Mar 2016 10:44:36 +0100 Subject: [PATCH 11/11] Move realm model classes to main flavor. - Entities are not generated correctly if they are in androidTest. --- .../java/de/greenrobot/performance/realm/IndexedStringEntity.java | 0 .../java/de/greenrobot/performance/realm/SimpleEntityNotNull.java | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Realm/src/{androidTest => main}/java/de/greenrobot/performance/realm/IndexedStringEntity.java (100%) rename Realm/src/{androidTest => main}/java/de/greenrobot/performance/realm/SimpleEntityNotNull.java (100%) diff --git a/Realm/src/androidTest/java/de/greenrobot/performance/realm/IndexedStringEntity.java b/Realm/src/main/java/de/greenrobot/performance/realm/IndexedStringEntity.java similarity index 100% rename from Realm/src/androidTest/java/de/greenrobot/performance/realm/IndexedStringEntity.java rename to Realm/src/main/java/de/greenrobot/performance/realm/IndexedStringEntity.java diff --git a/Realm/src/androidTest/java/de/greenrobot/performance/realm/SimpleEntityNotNull.java b/Realm/src/main/java/de/greenrobot/performance/realm/SimpleEntityNotNull.java similarity index 100% rename from Realm/src/androidTest/java/de/greenrobot/performance/realm/SimpleEntityNotNull.java rename to Realm/src/main/java/de/greenrobot/performance/realm/SimpleEntityNotNull.java