Update to Android Studio 1.3 and Gradle Wrapper 2.4 + small optimizat…

…ion to backlog loading / rendering
irccloud · Jun 28, 2015 · 11361af · 11361af
1 parent ce7d3bf
commit 11361af
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 119 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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.4-all.zip
diff --git a/irccloud-android.iml b/irccloud-android.iml
@@ -12,13 +12,15 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debugTest" />
     <exclude-output />

diff --git a/src/com/irccloud/android/IRCCloudApplicationBase.java b/src/com/irccloud/android/IRCCloudApplicationBase.java
@@ -47,11 +47,6 @@ public class IRCCloudApplicationBase extends Application {
     private static final int RINGTONE_VERSION = 1;
 
     private NetworkConnection conn = null;
-    private ServersDataSource s = null;
-    private BuffersDataSource b = null;
-    private ChannelsDataSource c = null;
-    private UsersDataSource u = null;
-    private EventsDataSource e = null;
 
     @Override
     public void onCreate() {
@@ -65,11 +60,6 @@ public void onCreate() {
 
         //Allocate all the shared objects at launch
         conn = NetworkConnection.getInstance();
-        s = ServersDataSource.getInstance();
-        b = BuffersDataSource.getInstance();
-        c = ChannelsDataSource.getInstance();
-        u = UsersDataSource.getInstance();
-        e = EventsDataSource.getInstance();
         ColorFormatter.init();
 
         if (prefs.contains("notify")) {