diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .idea/modules.xml | 1 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | app/build.gradle | 12 | ||||
| -rw-r--r-- | app/proguard-rules.pro | 8 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt | 4 | ||||
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | gradle.properties | 3 |
9 files changed, 36 insertions, 8 deletions
@@ -9,4 +9,6 @@ .externalNativeBuild /app/src/main/res/values/strings_facebook.xml /app/src/main/kotlin/com/pitchedapps/frost/facebook/Private.kt -*.min.css
\ No newline at end of file +*.min.css +/app/src/main/res/values/fabric.xml +fabric.properties diff --git a/.idea/modules.xml b/.idea/modules.xml index 3c64fcbf..7451d719 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,6 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/Frost-for-Facebook.iml" filepath="$PROJECT_DIR$/Frost-for-Facebook.iml" /> - <module fileurl="file://$PROJECT_DIR$/Frost-for-Facebook.iml" filepath="$PROJECT_DIR$/Frost-for-Facebook.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> </modules> </component> diff --git a/.travis.yml b/.travis.yml index 98f20a4d..a79ab0a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,5 @@ cache: - "$HOME/.m2" env: global: - secure: Sob0b0PXhJ5uq+quf74Vl/jWaJ0RVGqTcn83p45iQI/OCEvCLyLk4FojDrtEuu1wUrWNYnv4EpX2WcAUO8+93e93Y3XIfSltXOWnXtM6usSMm7/2iiT1nR0Q6L1mC0rFLvkkhnm1mlq1DGOZKB3eI6WJKx0+/oX3gWUWgmeTsTln7YjQl/QHIk4tJFt3K+DE0fDJfo561OawC2UUPESULv5O/fd4fbnVIcJYJDBciPqT/PNJ+Rx3DqKO3BKam6+ulv5fByCcPaDXiJ7NfWw+ggpgEBZaIoGy/UL6/it1LiDXRE2yHE1kRTjMOmiCd71pL26J0n4c+o2ldTSMz0dScmbA4c+elQDwCjtnXw21B/pNavRvhGX6iqRl2A3z5/ivVf6foSpCSzLm6FZSizAnMBAa0TxmPiM4F3QWvwtF6Rgo7hD/iuTVUW4i6mOIDfTWRPD4Ha6zdkj6OCRZ1OsIuw3OiYZNtlytX7aTyHIC2aoZw0sUkExbE/3fCP1Ej6632zxGjhof8jlvrnFJZacf921Q0/4O52H6KaQM6L0CV+YpPuctsEkFeoZ6xR0WXS9RTmCyGC3J6Qv+GWlbkFyLsphz43HSaGb8pIrljjmP1N7Q/7Oft54yEwbT6s8pXmBymkVeJQuyKTHzg5yyZgddWbiWM20kN6RA8jnykTMy5FU= + - secure: Sob0b0PXhJ5uq+quf74Vl/jWaJ0RVGqTcn83p45iQI/OCEvCLyLk4FojDrtEuu1wUrWNYnv4EpX2WcAUO8+93e93Y3XIfSltXOWnXtM6usSMm7/2iiT1nR0Q6L1mC0rFLvkkhnm1mlq1DGOZKB3eI6WJKx0+/oX3gWUWgmeTsTln7YjQl/QHIk4tJFt3K+DE0fDJfo561OawC2UUPESULv5O/fd4fbnVIcJYJDBciPqT/PNJ+Rx3DqKO3BKam6+ulv5fByCcPaDXiJ7NfWw+ggpgEBZaIoGy/UL6/it1LiDXRE2yHE1kRTjMOmiCd71pL26J0n4c+o2ldTSMz0dScmbA4c+elQDwCjtnXw21B/pNavRvhGX6iqRl2A3z5/ivVf6foSpCSzLm6FZSizAnMBAa0TxmPiM4F3QWvwtF6Rgo7hD/iuTVUW4i6mOIDfTWRPD4Ha6zdkj6OCRZ1OsIuw3OiYZNtlytX7aTyHIC2aoZw0sUkExbE/3fCP1Ej6632zxGjhof8jlvrnFJZacf921Q0/4O52H6KaQM6L0CV+YpPuctsEkFeoZ6xR0WXS9RTmCyGC3J6Qv+GWlbkFyLsphz43HSaGb8pIrljjmP1N7Q/7Oft54yEwbT6s8pXmBymkVeJQuyKTHzg5yyZgddWbiWM20kN6RA8jnykTMy5FU= + - secure: e+DDLI2Tj+c7DX428JMI3n6AVb20jyKgqhNT2JNv7aPzIfmbpWOZWV6etm6F1hsbqr5eWQWtpbtcm0qYCHm/qmvAkjUHph7Oo8Oly8m604iGZDZsUH9pD3GjeK2n8BFTYJW1IMg+wX9xxO63u9xv8RJ5kJ8QplDAYNv7kJIWfwbnvxM3Wl8IcQ9lVjhgMRV4IFLp+j7Rt/PTMgrockckwKfog6zLKPCXAco3hZQeou4BglqXByiL/NllFqzk7dAP9kOGtp4kLXphi+qhKZTx3OPAvW3N/rAuN2YMkHd0Lkl77zXm6zem6wEsZYvVqTNhJrvjL6RRdVsUPfbz8uSuAWw2FCjnxn4iUwye5inh1aUsaXoYFwZRT0S+lUEGeBB3PUEgPUboUcXKHhjBnmTSuZeePwgvN242jvVoFV+0BD6DJw3hCzKeS3xkTEr2VVeYQwJ7KrNSUAIod0Fb7uBcm1WDUuCb54uTTgyPnKEBpc3mdP06KFVgQduNSgqmq1Si180y2+ogMHYhjf8iH+pN6urwFYQD16l7NQvaMVqQSp9VkLiYyPGjdWslwS6UN0p4kEbwbc8pqE7USVWyGaqy6WUe/2VEXUdVIhz+cPBrwa4qOaRi4ERsVh1BIfUY9vQEUQvvpT7N0LL8TkrQ/8ISCdlSeDhDyplLJISdonIWQJA= diff --git a/app/build.gradle b/app/build.gradle index 9c76f38c..281799ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,13 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'io.fabric' +def fabricProps = new Properties() +file("../fabric.properties").withInputStream { + stream -> fabricProps.load(stream) +} +def FABRIC_API_KEY = System.env.FABRIC_API_KEY ?: fabricProps.getProperty('FABRIC_API_KEY', 'empty') +println 'Fabric ' + FABRIC_API_KEY android { compileSdkVersion Integer.parseInt(project.TARGET_SDK) buildToolsVersion project.BUILD_TOOLS @@ -13,6 +20,7 @@ android { versionName project.VERSION_NAME multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + manifestPlaceholders = [fabricApiKey: FABRIC_API_KEY] } applicationVariants.all { variant -> @@ -142,6 +150,10 @@ dependencies { kapt "nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}" compile "com.jude:swipebackhelper:${SWIPE_BACK}" + + compile("com.crashlytics.sdk.android:crashlytics:${CRASHLYTICS}@aar") { + transitive = true; + } } kapt { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 550646f0..931de8da 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -5,4 +5,10 @@ -keepclassmembers class ** { @org.greenrobot.eventbus.Subscribe <methods>; } --keep enum org.greenrobot.eventbus.ThreadMode { *; }
\ No newline at end of file +-keep enum org.greenrobot.eventbus.ThreadMode { *; } + +-keepclassmembers class * extends java.lang.Enum { + public *; + public static **[] values(); + public static ** valueOf(java.lang.String); +}
\ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c09c1209..ae058ff2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -93,6 +93,7 @@ <activity android:name=".LoginActivity" android:theme="@style/AppTheme.NoActionBar" /> + <receiver android:name=".services.NotificationReceiver" android:enabled="true" @@ -103,6 +104,9 @@ <action android:name="com.pitchedapps.frost.NOTIFICATIONS" /> </intent-filter> </receiver> + <meta-data + android:name="io.fabric.ApiKey" + android:value="${fabricApiKey}" /> </application> </manifest>
\ No newline at end of file diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt index 936c237a..2f81d387 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt @@ -2,9 +2,11 @@ package com.pitchedapps.frost import android.os.Bundle import android.support.v7.app.AppCompatActivity +import com.crashlytics.android.Crashlytics import com.pitchedapps.frost.dbflow.loadFbCookiesAsync import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.launchNewTask +import io.fabric.sdk.android.Fabric /** * Created by Allan Wang on 2017-05-28. @@ -13,7 +15,7 @@ class StartActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + Fabric.with(this, Crashlytics()) L.d("Load cookies ${System.currentTimeMillis()}") loadFbCookiesAsync { cookies -> diff --git a/build.gradle b/build.gradle index 6fafc759..1ee01293 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,12 @@ buildscript { ext.kotlin_version = '1.1.2-4' repositories { jcenter() + maven { url 'https://maven.fabric.io/public' } } dependencies { classpath 'com.android.tools.build:gradle:2.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'io.fabric.tools:gradle:1.+' } } @@ -18,6 +18,7 @@ allprojects { jcenter() mavenCentral() maven { url "https://jitpack.io" } + maven { url 'https://maven.fabric.io/public' } } } diff --git a/gradle.properties b/gradle.properties index 726ebeea..e7b02084 100644 --- a/gradle.properties +++ b/gradle.properties @@ -47,4 +47,5 @@ AUTO_VALUE_PARCEL=0.2.5 RX_PREFS=2.0.0-RC2 EVENT_BUS=3.0.0 PAPER_PARCEL=2.0.1 -SWIPE_BACK=3.1.2
\ No newline at end of file +SWIPE_BACK=3.1.2 +CRASHLYTICS=2.6.8
\ No newline at end of file |