diff --git a/app/app-release.apk b/app/app-release.apk index 3d309da..cdd86b5 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index 882293e..00f1cac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { resValue "string", "tray__authority", "${applicationId}.tray" minSdkVersion 15 targetSdkVersion 22 - versionCode 15 - versionName "1.7.5" + versionCode 16 + versionName "1.7.6" } buildTypes { release { @@ -26,8 +26,8 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:support-v4:22.1.1' - compile 'com.android.support:appcompat-v7:22.1.1' + compile 'com.android.support:support-v4:22.2.0' + compile 'com.android.support:appcompat-v7:22.2.0' compile 'net.grandcentrix.tray:tray:0.9.2' compile project(':saxrssreader') } diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt index 3b3c0db..e08dd9e 100644 --- a/app/manifest-merger-release-report.txt +++ b/app/manifest-merger-release-report.txt @@ -19,9 +19,9 @@ ADDED from AndroidManifest.xml:2:1 ADDED from AndroidManifest.xml:6:5 uses-sdk ADDED from AndroidManifest.xml:8:5 -MERGED from com.android.support:support-v4:22.1.1:20:5 -MERGED from com.android.support:appcompat-v7:22.1.1:20:5 -MERGED from com.android.support:support-v4:22.1.1:20:5 +MERGED from com.android.support:support-v4:22.2.0:20:5 +MERGED from com.android.support:appcompat-v7:22.2.0:20:5 +MERGED from com.android.support:support-v4:22.2.0:20:5 MERGED from net.grandcentrix.tray:tray:0.9.2:7:5 MERGED from FacebookLite:saxrssreader:unspecified:7:5 android:targetSdkVersion @@ -55,9 +55,9 @@ ADDED from AndroidManifest.xml:16:5 ADDED from AndroidManifest.xml:16:22 application ADDED from AndroidManifest.xml:18:5 -MERGED from com.android.support:support-v4:22.1.1:22:5 -MERGED from com.android.support:appcompat-v7:22.1.1:22:5 -MERGED from com.android.support:support-v4:22.1.1:22:5 +MERGED from com.android.support:support-v4:22.2.0:22:5 +MERGED from com.android.support:appcompat-v7:22.2.0:22:5 +MERGED from com.android.support:support-v4:22.2.0:22:5 MERGED from net.grandcentrix.tray:tray:0.9.2:11:5 MERGED from FacebookLite:saxrssreader:unspecified:11:5 android:label @@ -194,5 +194,3 @@ ADDED from net.grandcentrix.tray:tray:0.9.2:12:9 ADDED from net.grandcentrix.tray:tray:0.9.2:15:13 android:name ADDED from net.grandcentrix.tray:tray:0.9.2:13:13 -android:uses-permission#android.permission.READ_PHONE_STATE -IMPLIED from AndroidManifest.xml:2:1 reason: nl.matshofman.saxrssreader has a targetSdkVersion < 4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f7c28fb..7e11449 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ - +