Merge branch 'release/v0.9.5.2' into develop

This commit is contained in:
Jan Christian Grünhage 2017-03-19 15:05:43 +01:00
commit 2f7369abd8
Signed by: jcgruenhage
GPG key ID: 321A67D9EE8BC3E1
3 changed files with 7 additions and 10 deletions

View file

@ -20,8 +20,6 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
@ -38,5 +36,4 @@ allprojects {
repositories { repositories {
jcenter() jcenter()
} }
} }

View file

@ -42,5 +42,5 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.android.support:appcompat-v7:25.2.0'
} }

View file

@ -33,8 +33,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 25 targetSdkVersion 25
// TODO Change Version with releases // TODO Change Version with releases
versionCode 108 versionCode 109
versionName '0.9.5.1' versionName '0.9.5.2'
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
jackOptions { jackOptions {
@ -58,9 +58,9 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':framework') compile project(':framework')
compile project(':playmusiclib') compile project(':playmusiclib')
compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:support-v4:25.1.1' compile 'com.android.support:support-v4:25.2.0'
compile 'com.android.support:design:25.1.1' compile 'com.android.support:design:25.2.0'
compile 'com.android.support:support-vector-drawable:25.1.1' compile 'com.android.support:support-vector-drawable:25.2.0'
compile 'com.github.paolorotolo:appintro:4.1.0' compile 'com.github.paolorotolo:appintro:4.1.0'
} }