add RxJava and multidexing

This commit is contained in:
Phillip Thelen 2016-04-07 14:54:59 +02:00
parent 809a247766
commit 051fed2f72
4 changed files with 29 additions and 4 deletions

View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="51"
android:versionName="0.0.27.5"
android:versionCode="52"
android:versionName="0.0.28"
android:screenOrientation="portrait"
android:installLocation="auto" >

View file

@ -9,7 +9,9 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'io.fabric.tools:gradle:1.+'
classpath 'io.fabric.tools:gradle:1.21.5'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'
}
}
@ -58,6 +60,7 @@ dependencies {
compile 'com.android.support:gridlayout-v7:23.2.1'
compile 'com.android.support:recyclerview-v7:23.2.1'
compile 'com.android.support:preference-v14:23.2.1'
compile 'com.android.support:multidex:1.0.1'
// Image Loading/Caching
compile 'com.squareup.picasso:picasso:2.5.2'
@ -95,6 +98,10 @@ dependencies {
compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
compile 'io.reactivex:rxandroid:1.1.0'
compile 'io.reactivex:rxjava:1.1.2'
compile 'com.trello:rxlifecycle:0.5.0'
compile 'com.amplitude:android-sdk:2.5.0'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
@ -126,10 +133,12 @@ android {
debuggable true
// Disable fabric build ID generation for debug builds
ext.enableCrashlytics = false
multiDexEnabled true
}
release {
signingConfig signingConfigs.release
debuggable false
multiDexEnabled true
}
}
@ -151,6 +160,11 @@ android {
release.setRoot('build-types/release')
instrumentTest.setRoot('tests')
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
def Properties props = new Properties()
@ -172,3 +186,7 @@ if (propFile.canRead()) {
println 'signing.properties not found'
android.buildTypes.release.signingConfig = null
}
apply plugin: 'com.getkeepsafe.dexcount'
apply plugin: 'com.android.application' //or apply plugin: 'java'
apply plugin: 'me.tatarka.retrolambda'

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/transparent" />
</shape>

View file

@ -12,6 +12,8 @@ import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.multidex.MultiDex;
import android.support.multidex.MultiDexApplication;
import android.util.Log;
import com.amplitude.api.Amplitude;
@ -40,7 +42,7 @@ import io.fabric.sdk.android.Fabric;
/**
* Created by Negue on 14.06.2015.
*/
public class HabiticaApplication extends Application {
public class HabiticaApplication extends MultiDexApplication {
public static String Purchase20Gems = "com.habitrpg.android.habitica.iap.20.gems";
public static HabitRPGUser User;