tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Crashlytics

Browse source
This commit is contained in:
Karim Abou Zeid 2015-02-07 12:22:38 +01:00
commit ea5baf949d
2 changed files with 55 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -56,7 +56,7 @@ dependencies {
compile 'com.mcxiaoke.volley:library:1.0.+'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
compile 'com.afollestad:material-dialogs:0.6.1.5'
compile('com.crashlytics.sdk.android:crashlytics:2.1.0@aar') {
compile('com.crashlytics.sdk.android:crashlytics:2.2.1@aar') {
transitive = true;
}
compile files('../libs/jaudiotagger-2.0.4-20111207.115108-15.jar')

108
app/manifest-merger-release-report.txt
View file

@ -2,40 +2,40 @@
manifest
ADDED from AndroidManifest.xml:2:1
package
ADDED from AndroidManifest.xml:3:11
ADDED from AndroidManifest.xml:3:5
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
android:versionName
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
xmlns:android
ADDED from AndroidManifest.xml:2:11
ADDED from AndroidManifest.xml:4:5
android:versionCode
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
uses-permission#android.permission.WAKE_LOCK
ADDED from AndroidManifest.xml:5:5
android:name
ADDED from AndroidManifest.xml:5:22
uses-permission#android.permission.READ_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:6:5
android:name
ADDED from AndroidManifest.xml:6:22
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
uses-permission#android.permission.READ_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:7:5
android:name
ADDED from AndroidManifest.xml:7:22
uses-permission#android.permission.VIBRATE
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from AndroidManifest.xml:8:5
android:name
ADDED from AndroidManifest.xml:8:22
uses-permission#android.permission.INTERNET
uses-permission#android.permission.VIBRATE
ADDED from AndroidManifest.xml:9:5
MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:11:5
android:name
ADDED from AndroidManifest.xml:9:22
uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:10:5
MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:11:5
android:name
ADDED from AndroidManifest.xml:10:22
application
ADDED from AndroidManifest.xml:11:5
ADDED from AndroidManifest.xml:12:5
MERGED from com.android.support:appcompat-v7:21.0.3:16:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.android.support:gridlayout-v7:21.0.3:16:5
@ -54,6 +54,7 @@ MERGED from com.android.support:recyclerview-v7:21.0.3:17:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.android.support:recyclerview-v7:21.0.3:17:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.afollestad:material-dialogs:0.6.1.5:12:5
MERGED from com.android.support:appcompat-v7:21.0.3:16:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:13:5
@ -62,82 +63,83 @@ MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5
MERGED from com.crashlytics.sdk.android:answers:1.0.2:11:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:11:5
MERGED from com.android.support:support-v4:21.0.3:16:5
android:label
ADDED from AndroidManifest.xml:15:9
android:allowBackup
ADDED from AndroidManifest.xml:13:9
android:icon
ADDED from AndroidManifest.xml:14:9
android:theme
ADDED from AndroidManifest.xml:16:9
android:allowBackup
ADDED from AndroidManifest.xml:14:9
android:icon
ADDED from AndroidManifest.xml:15:9
android:theme
ADDED from AndroidManifest.xml:17:9
android:name
ADDED from AndroidManifest.xml:12:9
ADDED from AndroidManifest.xml:13:9
activity#com.kabouzeid.materialmusic.ui.activities.MainActivity
ADDED from AndroidManifest.xml:17:9
ADDED from AndroidManifest.xml:18:9
android:label
ADDED from AndroidManifest.xml:20:13
android:name
ADDED from AndroidManifest.xml:19:13
android:name
ADDED from AndroidManifest.xml:18:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:20:13
ADDED from AndroidManifest.xml:21:13
action#android.intent.action.MAIN
ADDED from AndroidManifest.xml:21:17
ADDED from AndroidManifest.xml:22:17
android:name
ADDED from AndroidManifest.xml:21:25
ADDED from AndroidManifest.xml:22:25
category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:23:17
ADDED from AndroidManifest.xml:24:17
android:name
ADDED from AndroidManifest.xml:23:27
ADDED from AndroidManifest.xml:24:27
activity#com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity
ADDED from AndroidManifest.xml:26:9
ADDED from AndroidManifest.xml:27:9
android:name
ADDED from AndroidManifest.xml:26:19
ADDED from AndroidManifest.xml:27:19
activity#com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity
ADDED from AndroidManifest.xml:28:9
ADDED from AndroidManifest.xml:29:9
android:name
ADDED from AndroidManifest.xml:28:19
ADDED from AndroidManifest.xml:29:19
activity#com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity
ADDED from AndroidManifest.xml:30:9
ADDED from AndroidManifest.xml:31:9
android:parentActivityName
ADDED from AndroidManifest.xml:33:13
android:name
ADDED from AndroidManifest.xml:32:13
android:name
ADDED from AndroidManifest.xml:31:13
service#com.kabouzeid.materialmusic.service.MusicService
ADDED from AndroidManifest.xml:35:9
ADDED from AndroidManifest.xml:36:9
android:enabled
ADDED from AndroidManifest.xml:38:13
android:name
ADDED from AndroidManifest.xml:37:13
android:name
ADDED from AndroidManifest.xml:36:13
receiver#com.kabouzeid.materialmusic.service.MediaButtonIntentReceiver
ADDED from AndroidManifest.xml:40:9
ADDED from AndroidManifest.xml:41:9
android:name
ADDED from AndroidManifest.xml:40:19
ADDED from AndroidManifest.xml:41:19
intent-filter#android.intent.action.MEDIA_BUTTON
ADDED from AndroidManifest.xml:41:13
ADDED from AndroidManifest.xml:42:13
action#android.intent.action.MEDIA_BUTTON
ADDED from AndroidManifest.xml:42:17
ADDED from AndroidManifest.xml:43:17
android:name
ADDED from AndroidManifest.xml:42:25
ADDED from AndroidManifest.xml:43:25
meta-data#com.crashlytics.ApiKey
ADDED from AndroidManifest.xml:46:9
ADDED from AndroidManifest.xml:47:9
android:value
ADDED from AndroidManifest.xml:49:13
android:name
ADDED from AndroidManifest.xml:48:13
android:name
ADDED from AndroidManifest.xml:47:13
activity#com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity
ADDED from AndroidManifest.xml:50:9
ADDED from AndroidManifest.xml:51:9
android:label
ADDED from AndroidManifest.xml:52:13
android:windowSoftInputMode
ADDED from AndroidManifest.xml:53:13
android:windowSoftInputMode
ADDED from AndroidManifest.xml:54:13
android:name
ADDED from AndroidManifest.xml:51:13
ADDED from AndroidManifest.xml:52:13
activity#com.kabouzeid.materialmusic.ui.activities.tageditor.AlbumTagEditorActivity
ADDED from AndroidManifest.xml:55:9
ADDED from AndroidManifest.xml:56:9
android:label
ADDED from AndroidManifest.xml:57:13
ADDED from AndroidManifest.xml:58:13
android:name
ADDED from AndroidManifest.xml:56:13
ADDED from AndroidManifest.xml:57:13
uses-sdk
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
MERGED from com.android.support:appcompat-v7:21.0.3:15:5
@ -159,7 +161,7 @@ MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.github.ksoichiro:android-observablescrollview:1.3.0:21:5
MERGED from com.android.support:recyclerview-v7:21.0.3:15:5
MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.afollestad:material-dialogs:0.4.8:8:5
MERGED from com.afollestad:material-dialogs:0.6.1.5:8:5
MERGED from com.android.support:appcompat-v7:21.0.3:15:5
MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.crashlytics.sdk.android:crashlytics:2.1.0:7:5
@ -168,6 +170,8 @@ MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5
MERGED from com.crashlytics.sdk.android:answers:1.0.2:7:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5
MERGED from io.fabric.sdk.android:fabric:1.0.2:7:5
MERGED from asia.ivity.android:drag-sort-listview:1.0:6:5
MERGED from com.android.support:support-v4:21.0.3:15:5
android:targetSdkVersion
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0