diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2014-12-06 14:06:00 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2014-12-06 14:06:00 +0100 |
commit | bb59449fbcbb46ba018313c51150924e7aec3be0 (patch) | |
tree | 7dc632b301f26f59e9ef83daaa566d929a15791b /app | |
parent | 2d887e4226d60347a97518c8efafa507d7ab7bed (diff) | |
download | fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.tar.gz fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.tar.bz2 fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.tar.xz fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.zip |
o Upgrading gadle.
o Adding crashlytics.
Diffstat (limited to 'app')
-rw-r--r-- | app/app.iml | 6 | ||||
-rw-r--r-- | app/build.gradle | 22 | ||||
-rw-r--r-- | app/src/main/AndroidManifest.xml | 3 | ||||
-rw-r--r-- | app/src/main/java/no/topi/fiken/display/MainActivity.java | 3 |
4 files changed, 32 insertions, 2 deletions
diff --git a/app/app.iml b/app/app.iml index 6a4dade..fc62166 100644 --- a/app/app.iml +++ b/app/app.iml @@ -31,11 +31,13 @@ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> @@ -81,6 +83,10 @@ </content> <orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" exported="" name="answers-1.0.2" level="project" /> + <orderEntry type="library" exported="" name="fabric-1.0.2" level="project" /> + <orderEntry type="library" exported="" name="crashlytics-2.1.0" level="project" /> + <orderEntry type="library" exported="" name="beta-1.0.2" level="project" /> </component> </module> diff --git a/app/build.gradle b/app/build.gradle index 4073375..f17e47f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,19 @@ +buildscript { + repositories { + maven { url 'https://maven.fabric.io/public' } + } + + dependencies { + classpath 'io.fabric.tools:gradle:1.14.4' + } +} apply plugin: 'com.android.application' +apply plugin: 'io.fabric' + +repositories { + maven { url 'https://maven.fabric.io/public' } +} + android { compileSdkVersion 18 @@ -13,12 +28,15 @@ android { } buildTypes { release { - runProguard false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' +// runProguard false +// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) + compile('com.crashlytics.sdk.android:crashlytics:2.1.0@aar') { + transitive = true; + } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 35956d8..14c5ba9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,6 +15,8 @@ <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> + <uses-permission android:name="android.permission.INTERNET"/> + <!-- <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" @@ -51,6 +53,7 @@ <service android:name=".DefaultDisplayService" android:enabled="true" /> + <meta-data android:name="com.crashlytics.ApiKey" android:value="cf760ececcb6d74c66781b3e21ae115aaae3ffd3"/> </application> </manifest> diff --git a/app/src/main/java/no/topi/fiken/display/MainActivity.java b/app/src/main/java/no/topi/fiken/display/MainActivity.java index 6c21afe..4f94784 100644 --- a/app/src/main/java/no/topi/fiken/display/MainActivity.java +++ b/app/src/main/java/no/topi/fiken/display/MainActivity.java @@ -25,6 +25,8 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import com.crashlytics.android.Crashlytics; +import io.fabric.sdk.android.Fabric; import java.util.ArrayList; import java.util.List; @@ -55,6 +57,7 @@ public class MainActivity extends ListActivity { Log.i(TAG, "onCreate"); Thread.setDefaultUncaughtExceptionHandler(EXCEPTION_HANDLER); super.onCreate(savedInstanceState); + Fabric.with(this, new Crashlytics()); ActionBar actionBar = getActionBar(); if (actionBar != null) { |