Merge branch 'develop'

capitoledulibre · Nov 11, 2015 · 5ea6ed2 · 5ea6ed2
2 parents 07544e3 + b453db3
commit 5ea6ed2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,30 @@
+buildscript {
+    repositories {
+        maven { url 'https://maven.fabric.io/public' }
+    }
+
+    dependencies {
+        classpath 'io.fabric.tools:gradle:1.+'
+    }
+}
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
+
+repositories {
+    maven { url 'https://maven.fabric.io/public' }
+}
+
 
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "org.toulibre.cdl"
-        minSdkVersion 7
+        minSdkVersion 8
         targetSdkVersion 21
-        versionCode 3
-        versionName "1.3.3"
+        versionCode 4
+        versionName "1.3.4"
     }
 
     buildTypes {
@@ -24,4 +39,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:21.+'
     compile 'com.android.support:cardview-v7:21.+'
     compile 'com.commit451:PhotoView:1.2.4'
+    compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
+        transitive = true;
+    }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -105,6 +105,9 @@
             android:name=".providers.SearchSuggestionProvider"
             android:authorities="org.toulibre.cdl.search"
             android:exported="true"/>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="7826122d19d8fbe241d1d771f84d07700dad4371" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/toulibre/cdl/CdlApplication.java b/app/src/main/java/org/toulibre/cdl/CdlApplication.java
@@ -1,5 +1,7 @@
 package org.toulibre.cdl;
 
+import com.crashlytics.android.Crashlytics;
+import io.fabric.sdk.android.Fabric;
 import org.toulibre.cdl.alarms.FosdemAlarmManager;
 import org.toulibre.cdl.db.DatabaseManager;
 
@@ -11,6 +13,7 @@ public class CdlApplication extends Application {
 	@Override
 	public void onCreate() {
 		super.onCreate();
+		Fabric.with(this, new Crashlytics());
 
 		DatabaseManager.init(this);
 		// Initialize settings