Skip to content

Commit

Permalink
version up -> '0.9.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@shts
shts committed Mar 10, 2015
1 parent e27c90d commit ebaf8fe
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 95 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "shts.jp.android.nogifeed"
minSdkVersion 10
targetSdkVersion 21
versionCode 6
versionName "0.9.3"
versionCode 7
versionName "0.9.4"
}
buildTypes {
debug {
Expand Down
186 changes: 93 additions & 93 deletions app/manifest-merger-release-report.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ uses-permission#com.google.android.c2dm.permission.RECEIVE
ADDED from AndroidManifest.xml:17:5
android:name
ADDED from AndroidManifest.xml:17:22
permission#android.shts.jp.nogifeed.permission.C2D_MESSAGE
permission#shts.jp.android.nogifeed.permission.C2D_MESSAGE
ADDED from AndroidManifest.xml:24:5
android:protectionLevel
ADDED from AndroidManifest.xml:24:17
android:name
ADDED from AndroidManifest.xml:25:9
uses-permission#android.shts.jp.nogifeed.permission.C2D_MESSAGE
uses-permission#shts.jp.android.nogifeed.permission.C2D_MESSAGE
ADDED from AndroidManifest.xml:26:5
android:name
ADDED from AndroidManifest.xml:26:22
application
ADDED from AndroidManifest.xml:36:5
ADDED from AndroidManifest.xml:32: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.google.android.gms:play-services:6.1.11:16:5
Expand All @@ -73,181 +73,181 @@ MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.jpardogo.materialtabstrip:library:1.0.5:9:5
MERGED from com.android.support:support-v4:21.0.3:16:5
android:label
ADDED from AndroidManifest.xml:40:9
ADDED from AndroidManifest.xml:36:9
android:allowBackup
ADDED from AndroidManifest.xml:38:9
ADDED from AndroidManifest.xml:34:9
android:icon
ADDED from AndroidManifest.xml:39:9
ADDED from AndroidManifest.xml:35:9
android:theme
ADDED from AndroidManifest.xml:41:9
android:name
ADDED from AndroidManifest.xml:37:9
android:name
ADDED from AndroidManifest.xml:33:9
meta-data#com.google.android.gms.version
ADDED from AndroidManifest.xml:42:9
ADDED from AndroidManifest.xml:38:9
android:name
ADDED from AndroidManifest.xml:42:20
ADDED from AndroidManifest.xml:38:20
android:value
ADDED from AndroidManifest.xml:43:13
ADDED from AndroidManifest.xml:39:13
activity#shts.jp.android.nogifeed.MyActivity
ADDED from AndroidManifest.xml:44:9
ADDED from AndroidManifest.xml:40:9
android:screenOrientation
ADDED from AndroidManifest.xml:47:13
ADDED from AndroidManifest.xml:43:13
android:label
ADDED from AndroidManifest.xml:46:13
ADDED from AndroidManifest.xml:42:13
android:name
ADDED from AndroidManifest.xml:45:13
ADDED from AndroidManifest.xml:41:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:48:13
ADDED from AndroidManifest.xml:44:13
action#android.intent.action.MAIN
ADDED from AndroidManifest.xml:49:17
ADDED from AndroidManifest.xml:45:17
android:name
ADDED from AndroidManifest.xml:49:25
ADDED from AndroidManifest.xml:45:25
category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:50:17
ADDED from AndroidManifest.xml:46:17
android:name
ADDED from AndroidManifest.xml:50:27
ADDED from AndroidManifest.xml:46:27
activity#shts.jp.android.nogifeed.activities.DeepLinkAcivity
ADDED from AndroidManifest.xml:53:9
ADDED from AndroidManifest.xml:49:9
android:name
ADDED from AndroidManifest.xml:53:19
ADDED from AndroidManifest.xml:49:19
intent-filter#android.intent.action.VIEW+android.intent.category.BROWSABLE+android.intent.category.DEFAULT
ADDED from AndroidManifest.xml:54:13
ADDED from AndroidManifest.xml:50:13
action#android.intent.action.VIEW
ADDED from AndroidManifest.xml:55:17
ADDED from AndroidManifest.xml:51:17
android:name
ADDED from AndroidManifest.xml:55:25
ADDED from AndroidManifest.xml:51:25
category#android.intent.category.DEFAULT
ADDED from AndroidManifest.xml:56:17
ADDED from AndroidManifest.xml:52:17
android:name
ADDED from AndroidManifest.xml:56:27
ADDED from AndroidManifest.xml:52:27
category#android.intent.category.BROWSABLE
ADDED from AndroidManifest.xml:57:17
ADDED from AndroidManifest.xml:53:17
android:name
ADDED from AndroidManifest.xml:57:27
ADDED from AndroidManifest.xml:53:27
data
ADDED from AndroidManifest.xml:59:17
ADDED from AndroidManifest.xml:55:17
android:host
ADDED from AndroidManifest.xml:59:45
ADDED from AndroidManifest.xml:55:45
android:path
ADDED from AndroidManifest.xml:59:80
ADDED from AndroidManifest.xml:55:80
android:scheme
ADDED from AndroidManifest.xml:59:23
ADDED from AndroidManifest.xml:55:23
activity#shts.jp.android.nogifeed.activities.MemberDetailActivity
ADDED from AndroidManifest.xml:64:9
ADDED from AndroidManifest.xml:60:9
android:screenOrientation
ADDED from AndroidManifest.xml:66:13
ADDED from AndroidManifest.xml:62:13
android:label
ADDED from AndroidManifest.xml:65:13
ADDED from AndroidManifest.xml:61:13
android:name
ADDED from AndroidManifest.xml:64:19
ADDED from AndroidManifest.xml:60:19
activity#shts.jp.android.nogifeed.activities.BlogActivity
ADDED from AndroidManifest.xml:68:9
ADDED from AndroidManifest.xml:64:9
android:screenOrientation
ADDED from AndroidManifest.xml:71:13
ADDED from AndroidManifest.xml:67:13
android:label
ADDED from AndroidManifest.xml:70:13
ADDED from AndroidManifest.xml:66:13
android:name
ADDED from AndroidManifest.xml:69:13
ADDED from AndroidManifest.xml:65:13
activity#shts.jp.android.nogifeed.activities.SettingsActivity
ADDED from AndroidManifest.xml:73:9
ADDED from AndroidManifest.xml:69:9
android:screenOrientation
ADDED from AndroidManifest.xml:76:13
ADDED from AndroidManifest.xml:72:13
android:label
ADDED from AndroidManifest.xml:75:13
ADDED from AndroidManifest.xml:71:13
android:name
ADDED from AndroidManifest.xml:74:13
ADDED from AndroidManifest.xml:70:13
activity#shts.jp.android.nogifeed.activities.AboutActivity
ADDED from AndroidManifest.xml:78:9
ADDED from AndroidManifest.xml:74:9
android:screenOrientation
ADDED from AndroidManifest.xml:81:13
ADDED from AndroidManifest.xml:77:13
android:label
ADDED from AndroidManifest.xml:80:13
ADDED from AndroidManifest.xml:76:13
android:name
ADDED from AndroidManifest.xml:79:13
ADDED from AndroidManifest.xml:75:13
activity#shts.jp.android.nogifeed.activities.MemberListActivity
ADDED from AndroidManifest.xml:83:9
ADDED from AndroidManifest.xml:79:9
android:screenOrientation
ADDED from AndroidManifest.xml:86:13
ADDED from AndroidManifest.xml:82:13
android:label
ADDED from AndroidManifest.xml:85:13
ADDED from AndroidManifest.xml:81:13
android:name
ADDED from AndroidManifest.xml:84:13
ADDED from AndroidManifest.xml:80:13
provider#shts.jp.android.nogifeed.providers.NogiFeedProvider
ADDED from AndroidManifest.xml:88:9
ADDED from AndroidManifest.xml:85:9
android:authorities
ADDED from AndroidManifest.xml:89:13
ADDED from AndroidManifest.xml:86:13
android:name
ADDED from AndroidManifest.xml:90:13
ADDED from AndroidManifest.xml:87:13
service#com.parse.PushService
ADDED from AndroidManifest.xml:93:9
ADDED from AndroidManifest.xml:90:9
android:name
ADDED from AndroidManifest.xml:93:18
ADDED from AndroidManifest.xml:90:18
receiver#com.parse.ParseBroadcastReceiver
ADDED from AndroidManifest.xml:94:9
ADDED from AndroidManifest.xml:91:9
android:name
ADDED from AndroidManifest.xml:94:19
ADDED from AndroidManifest.xml:91:19
intent-filter#android.intent.action.BOOT_COMPLETED+android.intent.action.USER_PRESENT
ADDED from AndroidManifest.xml:95:13
ADDED from AndroidManifest.xml:92:13
action#android.intent.action.BOOT_COMPLETED
ADDED from AndroidManifest.xml:96:17
ADDED from AndroidManifest.xml:93:17
android:name
ADDED from AndroidManifest.xml:96:25
ADDED from AndroidManifest.xml:93:25
action#android.intent.action.USER_PRESENT
ADDED from AndroidManifest.xml:97:17
ADDED from AndroidManifest.xml:94:17
android:name
ADDED from AndroidManifest.xml:97:25
ADDED from AndroidManifest.xml:94:25
receiver#com.parse.ParsePushBroadcastReceiver
ADDED from AndroidManifest.xml:100:9
ADDED from AndroidManifest.xml:97:9
android:exported
ADDED from AndroidManifest.xml:101:13
ADDED from AndroidManifest.xml:98:13
android:name
ADDED from AndroidManifest.xml:100:19
ADDED from AndroidManifest.xml:97:19
intent-filter#com.parse.push.intent.DELETE+com.parse.push.intent.OPEN+com.parse.push.intent.RECEIVE
ADDED from AndroidManifest.xml:102:13
ADDED from AndroidManifest.xml:99:13
action#com.parse.push.intent.RECEIVE
ADDED from AndroidManifest.xml:103:17
ADDED from AndroidManifest.xml:100:17
android:name
ADDED from AndroidManifest.xml:103:25
ADDED from AndroidManifest.xml:100:25
action#com.parse.push.intent.DELETE
ADDED from AndroidManifest.xml:104:17
ADDED from AndroidManifest.xml:101:17
android:name
ADDED from AndroidManifest.xml:104:25
ADDED from AndroidManifest.xml:101:25
action#com.parse.push.intent.OPEN
ADDED from AndroidManifest.xml:105:17
ADDED from AndroidManifest.xml:102:17
android:name
ADDED from AndroidManifest.xml:105:25
ADDED from AndroidManifest.xml:102:25
receiver#com.parse.GcmBroadcastReceiver
ADDED from AndroidManifest.xml:108:9
ADDED from AndroidManifest.xml:105:9
android:permission
ADDED from AndroidManifest.xml:109:13
ADDED from AndroidManifest.xml:106:13
android:name
ADDED from AndroidManifest.xml:108:19
intent-filter#android.shts.jp.nogifeed+com.google.android.c2dm.intent.RECEIVE+com.google.android.c2dm.intent.REGISTRATION
ADDED from AndroidManifest.xml:110:13
ADDED from AndroidManifest.xml:105:19
intent-filter#com.google.android.c2dm.intent.RECEIVE+com.google.android.c2dm.intent.REGISTRATION+shts.jp.android.nogifeed
ADDED from AndroidManifest.xml:107:13
action#com.google.android.c2dm.intent.RECEIVE
ADDED from AndroidManifest.xml:111:17
ADDED from AndroidManifest.xml:108:17
android:name
ADDED from AndroidManifest.xml:111:25
ADDED from AndroidManifest.xml:108:25
action#com.google.android.c2dm.intent.REGISTRATION
ADDED from AndroidManifest.xml:112:17
ADDED from AndroidManifest.xml:109:17
android:name
ADDED from AndroidManifest.xml:112:25
category#android.shts.jp.nogifeed
ADDED from AndroidManifest.xml:120:17
ADDED from AndroidManifest.xml:109:25
category#shts.jp.android.nogifeed
ADDED from AndroidManifest.xml:116:17
android:name
ADDED from AndroidManifest.xml:120:27
ADDED from AndroidManifest.xml:116:27
receiver#shts.jp.android.nogifeed.receivers.FromParseReceiver
ADDED from AndroidManifest.xml:125:9
ADDED from AndroidManifest.xml:121:9
android:exported
ADDED from AndroidManifest.xml:125:87
ADDED from AndroidManifest.xml:121:87
android:name
ADDED from AndroidManifest.xml:125:19
ADDED from AndroidManifest.xml:121:19
intent-filter#android.shts.jp.nogifeed.UPDATE_STATUS
ADDED from AndroidManifest.xml:126:13
ADDED from AndroidManifest.xml:122:13
action#android.shts.jp.nogifeed.UPDATE_STATUS
ADDED from AndroidManifest.xml:127:17
ADDED from AndroidManifest.xml:123:17
android:name
ADDED from AndroidManifest.xml:127:25
ADDED from AndroidManifest.xml:123:25
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
Expand Down

0 comments on commit ebaf8fe

Please sign in to comment.