bump version

bump version to 0.28
marunjar · Dec 11, 2014 · 1ffa5ff · 1ffa5ff
1 parent 062626c
commit 1ffa5ff
Show file tree

Hide file tree

Showing 3 changed files with 140 additions and 98 deletions.
diff --git a/aNewJKUApp/build.gradle b/aNewJKUApp/build.gradle
@@ -8,8 +8,8 @@ android {
     buildToolsVersion "21.1.1"
     defaultConfig {
         applicationId "org.voidsink.anewjkuapp"
-        versionCode 140027
-        versionName "0.27"
+        versionCode 140028
+        versionName "0.28"
         minSdkVersion 14
         targetSdkVersion 21
     }

diff --git a/aNewJKUApp/manifest-merger-release-report.txt b/aNewJKUApp/manifest-merger-release-report.txt
@@ -78,11 +78,24 @@ ADDED from AndroidManifest.xml:23:5
 application
 ADDED from AndroidManifest.xml:25:5
 MERGED from de.cketti.library.changelog:ckchangelog:1.2.1:10:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.android.support:appcompat-v7:21.0.2:16:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.android.support:gridlayout-v7:21.0.2:16:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.google.android.gms:play-services:6.5.87:20:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.mikepenz.aboutlibraries:library:4.4.0:11:5
+MERGED from com.android.support:cardview-v7:21.0.2:16:5
+MERGED from com.android.support:recyclerview-v7:21.0.0:17:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.android.support:appcompat-v7:21.0.2:16:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
+MERGED from com.android.support:cardview-v7:21.0.2:16:5
 MERGED from anewjkuapp:voidsinkContributors:unspecified:11:5
-MERGED from com.android.support:support-v4:20.0.0:17:5
-MERGED from com.google.android.gms:play-services:6.1.71:16:5
-MERGED from com.android.support:support-v4:20.0.0:17:5
-MERGED from com.github.gabrielemariotti.cards:library:1.9.1:28:5
+MERGED from com.android.support:android-support-v4-preferencefragment:1.0.0:24:5
+MERGED from com.android.support:support-v4:21.0.2:16:5
 	android:label
 		ADDED from AndroidManifest.xml:29:9
 	android:allowBackup
@@ -95,6 +108,7 @@ MERGED from com.github.gabrielemariotti.cards:library:1.9.1:28:5
 		ADDED from AndroidManifest.xml:26:9
 meta-data#com.google.android.gms.version
 ADDED from AndroidManifest.xml:32:9
+MERGED from com.google.android.gms:play-services:6.5.87:21:9
 	android:name
 		ADDED from AndroidManifest.xml:33:13
 	android:value
@@ -134,195 +148,220 @@ ADDED from AndroidManifest.xml:50:13
 activity#org.voidsink.anewjkuapp.activity.SettingsActivity
 ADDED from AndroidManifest.xml:54:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:57:13
+		ADDED from AndroidManifest.xml:58:13
 	android:permission
 		ADDED from AndroidManifest.xml:56:13
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:58:13
+		ADDED from AndroidManifest.xml:59:13
 	android:name
 		ADDED from AndroidManifest.xml:55:13
+	android:launchMode
+		ADDED from AndroidManifest.xml:57:13
 meta-data#android.support.PARENT_ACTIVITY
-ADDED from AndroidManifest.xml:61:13
+ADDED from AndroidManifest.xml:62:13
 	android:name
-		ADDED from AndroidManifest.xml:62:17
-	android:value
 		ADDED from AndroidManifest.xml:63:17
+	android:value
+		ADDED from AndroidManifest.xml:64:17
 intent-filter#android.intent.category.DEFAULT+org.voidsink.anewjkuapp.prefs.MAIN
-ADDED from AndroidManifest.xml:66:13
+ADDED from AndroidManifest.xml:67:13
 action#org.voidsink.anewjkuapp.prefs.MAIN
-ADDED from AndroidManifest.xml:67:17
+ADDED from AndroidManifest.xml:68:17
 	android:name
-		ADDED from AndroidManifest.xml:67:25
+		ADDED from AndroidManifest.xml:68:25
 category#android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:69:17
+ADDED from AndroidManifest.xml:70:17
 	android:name
-		ADDED from AndroidManifest.xml:69:27
+		ADDED from AndroidManifest.xml:70:27
 activity#org.voidsink.anewjkuapp.activity.AboutActivity
-ADDED from AndroidManifest.xml:72:9
+ADDED from AndroidManifest.xml:73:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:74:13
-	android:parentActivityName
 		ADDED from AndroidManifest.xml:75:13
+	android:parentActivityName
+		ADDED from AndroidManifest.xml:76:13
 	android:name
-		ADDED from AndroidManifest.xml:73:13
+		ADDED from AndroidManifest.xml:74:13
 activity#org.voidsink.anewjkuapp.activity.RssFeedEntryActivity
-ADDED from AndroidManifest.xml:81:9
+ADDED from AndroidManifest.xml:82:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:83:13
-	android:parentActivityName
 		ADDED from AndroidManifest.xml:84:13
+	android:parentActivityName
+		ADDED from AndroidManifest.xml:85:13
 	android:name
-		ADDED from AndroidManifest.xml:82:13
+		ADDED from AndroidManifest.xml:83:13
 activity#org.voidsink.anewjkuapp.activity.KusssAuthenticatorActivity
-ADDED from AndroidManifest.xml:90:9
+ADDED from AndroidManifest.xml:91:9
 	android:screenOrientation
-		ADDED from AndroidManifest.xml:93:13
+		ADDED from AndroidManifest.xml:94:13
 	android:permission
-		ADDED from AndroidManifest.xml:92:13
+		ADDED from AndroidManifest.xml:93:13
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:94:13
+		ADDED from AndroidManifest.xml:95:13
 	android:name
-		ADDED from AndroidManifest.xml:91:13
+		ADDED from AndroidManifest.xml:92:13
 intent-filter#android.intent.category.DEFAULT+org.voidsink.anewjkuapp.prefs.LOGIN
-ADDED from AndroidManifest.xml:102:13
+ADDED from AndroidManifest.xml:103:13
 action#org.voidsink.anewjkuapp.prefs.LOGIN
-ADDED from AndroidManifest.xml:103:17
+ADDED from AndroidManifest.xml:104:17
 	android:name
-		ADDED from AndroidManifest.xml:103:25
+		ADDED from AndroidManifest.xml:104:25
 activity#org.voidsink.anewjkuapp.dashclock.MensaDashclockSettings
-ADDED from AndroidManifest.xml:108:9
+ADDED from AndroidManifest.xml:109:9
 	android:label
-		ADDED from AndroidManifest.xml:111:13
+		ADDED from AndroidManifest.xml:112:13
 	android:exported
-		ADDED from AndroidManifest.xml:110:13
+		ADDED from AndroidManifest.xml:111:13
 	android:name
-		ADDED from AndroidManifest.xml:109:13
+		ADDED from AndroidManifest.xml:110:13
 service#org.voidsink.anewjkuapp.service.KusssService
-ADDED from AndroidManifest.xml:113:9
+ADDED from AndroidManifest.xml:114:9
 	android:label
-		ADDED from AndroidManifest.xml:116:13
+		ADDED from AndroidManifest.xml:117:13
 	android:exported
-		ADDED from AndroidManifest.xml:115:13
+		ADDED from AndroidManifest.xml:116:13
 	android:name
-		ADDED from AndroidManifest.xml:114:13
+		ADDED from AndroidManifest.xml:115:13
 service#org.voidsink.anewjkuapp.service.KusssAuthenticatorService
-ADDED from AndroidManifest.xml:117:9
+ADDED from AndroidManifest.xml:118:9
 	android:permission
-		ADDED from AndroidManifest.xml:119:13
+		ADDED from AndroidManifest.xml:120:13
 	android:name
-		ADDED from AndroidManifest.xml:118:13
+		ADDED from AndroidManifest.xml:119:13
 intent-filter#android.accounts.AccountAuthenticator
-ADDED from AndroidManifest.xml:120:13
+ADDED from AndroidManifest.xml:121:13
 action#android.accounts.AccountAuthenticator
-ADDED from AndroidManifest.xml:121:17
+ADDED from AndroidManifest.xml:122:17
 	android:name
-		ADDED from AndroidManifest.xml:121:25
+		ADDED from AndroidManifest.xml:122:25
 meta-data#android.accounts.AccountAuthenticator
-ADDED from AndroidManifest.xml:124:13
+ADDED from AndroidManifest.xml:125:13
 	android:resource
-		ADDED from AndroidManifest.xml:126:17
+		ADDED from AndroidManifest.xml:127:17
 	android:name
-		ADDED from AndroidManifest.xml:125:17
+		ADDED from AndroidManifest.xml:126:17
 service#org.voidsink.anewjkuapp.service.KusssCalendarSyncService
-ADDED from AndroidManifest.xml:128:9
+ADDED from AndroidManifest.xml:129:9
 	android:process
-		ADDED from AndroidManifest.xml:131:13
+		ADDED from AndroidManifest.xml:132:13
 	android:exported
-		ADDED from AndroidManifest.xml:130:13
+		ADDED from AndroidManifest.xml:131:13
 	android:name
-		ADDED from AndroidManifest.xml:129:13
+		ADDED from AndroidManifest.xml:130:13
 intent-filter#android.content.SyncAdapter
-ADDED from AndroidManifest.xml:132:13
+ADDED from AndroidManifest.xml:133:13
 action#android.content.SyncAdapter
-ADDED from AndroidManifest.xml:133:17
+ADDED from AndroidManifest.xml:134:17
 	android:name
-		ADDED from AndroidManifest.xml:133:25
+		ADDED from AndroidManifest.xml:134:25
 meta-data#android.content.SyncAdapter
-ADDED from AndroidManifest.xml:136:13
+ADDED from AndroidManifest.xml:137:13
 	android:resource
-		ADDED from AndroidManifest.xml:138:17
+		ADDED from AndroidManifest.xml:139:17
 	android:name
-		ADDED from AndroidManifest.xml:137:17
+		ADDED from AndroidManifest.xml:138:17
 service#org.voidsink.anewjkuapp.service.KusssSyncService
-ADDED from AndroidManifest.xml:140:9
+ADDED from AndroidManifest.xml:141:9
 	android:process
-		ADDED from AndroidManifest.xml:143:13
+		ADDED from AndroidManifest.xml:144:13
 	android:exported
-		ADDED from AndroidManifest.xml:142:13
+		ADDED from AndroidManifest.xml:143:13
 	android:name
-		ADDED from AndroidManifest.xml:141:13
+		ADDED from AndroidManifest.xml:142:13
 service#org.voidsink.anewjkuapp.dashclock.MensaDashclockExtension
-ADDED from AndroidManifest.xml:152:9
+ADDED from AndroidManifest.xml:153:9
 	android:label
-		ADDED from AndroidManifest.xml:155:13
+		ADDED from AndroidManifest.xml:156:13
 	android:icon
-		ADDED from AndroidManifest.xml:154:13
+		ADDED from AndroidManifest.xml:155:13
 	android:permission
-		ADDED from AndroidManifest.xml:156:13
+		ADDED from AndroidManifest.xml:157:13
 	android:name
-		ADDED from AndroidManifest.xml:153:13
+		ADDED from AndroidManifest.xml:154:13
 intent-filter#com.google.android.apps.dashclock.Extension
-ADDED from AndroidManifest.xml:157:13
+ADDED from AndroidManifest.xml:158:13
 action#com.google.android.apps.dashclock.Extension
-ADDED from AndroidManifest.xml:158:17
+ADDED from AndroidManifest.xml:159:17
 	android:name
-		ADDED from AndroidManifest.xml:158:25
+		ADDED from AndroidManifest.xml:159:25
 meta-data#protocolVersion
-ADDED from AndroidManifest.xml:161:13
+ADDED from AndroidManifest.xml:162:13
 	android:name
-		ADDED from AndroidManifest.xml:162:17
-	android:value
 		ADDED from AndroidManifest.xml:163:17
+	android:value
+		ADDED from AndroidManifest.xml:164:17
 meta-data#worldReadable
-ADDED from AndroidManifest.xml:164:13
+ADDED from AndroidManifest.xml:165:13
 	android:name
-		ADDED from AndroidManifest.xml:165:17
-	android:value
 		ADDED from AndroidManifest.xml:166:17
+	android:value
+		ADDED from AndroidManifest.xml:167:17
 meta-data#description
-ADDED from AndroidManifest.xml:167:13
+ADDED from AndroidManifest.xml:168:13
 	android:name
-		ADDED from AndroidManifest.xml:168:17
-	android:value
 		ADDED from AndroidManifest.xml:169:17
+	android:value
+		ADDED from AndroidManifest.xml:170:17
 meta-data#settingsActivity
-ADDED from AndroidManifest.xml:171:13
+ADDED from AndroidManifest.xml:172:13
 	android:name
-		ADDED from AndroidManifest.xml:172:17
-	android:value
 		ADDED from AndroidManifest.xml:173:17
+	android:value
+		ADDED from AndroidManifest.xml:174:17
 provider#org.voidsink.anewjkuapp.provider.KusssContentProvider
-ADDED from AndroidManifest.xml:176:9
+ADDED from AndroidManifest.xml:177:9
 	android:label
-		ADDED from AndroidManifest.xml:180:13
-	android:syncable
 		ADDED from AndroidManifest.xml:181:13
+	android:syncable
+		ADDED from AndroidManifest.xml:182:13
 	android:exported
-		ADDED from AndroidManifest.xml:179:13
+		ADDED from AndroidManifest.xml:180:13
 	android:authorities
-		ADDED from AndroidManifest.xml:178:13
+		ADDED from AndroidManifest.xml:179:13
 	android:name
-		ADDED from AndroidManifest.xml:177:13
+		ADDED from AndroidManifest.xml:178:13
 provider#org.voidsink.anewjkuapp.provider.PoiContentProvider
-ADDED from AndroidManifest.xml:182:9
+ADDED from AndroidManifest.xml:183:9
 	android:exported
-		ADDED from AndroidManifest.xml:185:13
+		ADDED from AndroidManifest.xml:186:13
 	android:authorities
-		ADDED from AndroidManifest.xml:184:13
+		ADDED from AndroidManifest.xml:185:13
 	android:name
-		ADDED from AndroidManifest.xml:183:13
+		ADDED from AndroidManifest.xml:184:13
 uses-sdk
 INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
 MERGED from de.cketti.library.changelog:ckchangelog:1.2.1:6:5
-MERGED from anewjkuapp:voidsinkContributors:unspecified:7:5
-MERGED from com.android.support:support-v4:20.0.0:16:5
-MERGED from com.google.android.gms:play-services:6.1.71:15:5
-MERGED from com.android.support:support-v4:20.0.0:16:5
-MERGED from com.github.gabrielemariotti.cards:library:1.9.1:24:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
+MERGED from com.android.support:appcompat-v7:21.0.2:15:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
+MERGED from com.android.support:gridlayout-v7:21.0.2:15:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
+MERGED from com.google.android.gms:play-services:6.5.87:18:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
 MERGED from se.emilsjolander:stickylistheaders:2.5.2:7:5
+MERGED from com.mikepenz.aboutlibraries:library:4.4.0:7:5
+MERGED from com.android.support:cardview-v7:21.0.2:15:5
+MERGED from com.android.support:recyclerview-v7:21.0.0:15:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
+MERGED from com.android.support:appcompat-v7:21.0.2:15:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
+MERGED from com.android.support:cardview-v7:21.0.2:15:5
+MERGED from anewjkuapp:voidsinkContributors:unspecified:7:5
+MERGED from com.android.support:android-support-v4-preferencefragment:1.0.0:20:5
+MERGED from com.android.support:support-v4:21.0.2:15:5
 	android:targetSdkVersion
 		INJECTED from AndroidManifest.xml:0:0
 		INJECTED from AndroidManifest.xml:0:0
 	android:minSdkVersion
 		INJECTED from AndroidManifest.xml:0:0
 		INJECTED from AndroidManifest.xml:0:0
+activity#com.mikepenz.aboutlibraries.ui.LibsActivity
+ADDED from com.mikepenz.aboutlibraries:library:4.4.0:12:9
+	android:name
+		ADDED from com.mikepenz.aboutlibraries:library:4.4.0:12:19
+activity#android.support.v7.widget.TestActivity
+ADDED from com.android.support:recyclerview-v7:21.0.0:18:9
+	android:label
+		ADDED from com.android.support:recyclerview-v7:21.0.0:18:19
+	android:name
+		ADDED from com.android.support:recyclerview-v7:21.0.0:18:60
diff --git a/aNewJKUApp/src/main/res/xml/changelog_master.xml b/aNewJKUApp/src/main/res/xml/changelog_master.xml
@@ -4,6 +4,9 @@
 		    + added
 		    - fixed
 		    * changed -->
+    <release version="0.28" versioncode="140028">
+        <change>Material Design: jetzt für die ganze App</change>
+    </release>
     <release version="0.27" versioncode="140027">
         <change>- Statistik: Diagramme werden wieder angezeigt</change>
     </release>