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

Merge branch 'master' of /Users/karim/Code/AndroidProjects/Phonograph with conflicts.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-01-27 12:13:53 +01:00
commit e7769b8c5d
3 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/build.gradle
View file

@ -63,10 +63,8 @@ android {
renderscriptTargetApi 23
applicationId "com.kabouzeid.gramophone"
versionCode 92
versionName "invalid"
manifestPlaceholders = [appName: "@string/app_name"]
versionCode 93
versionName "0.9.53 TEMP"
}
buildTypes {
release {
@ -76,9 +74,6 @@ android {
signingConfig signingConfigs.release
}
debug {
applicationIdSuffix '.debug'
versionNameSuffix ' DEBUG'
manifestPlaceholders = [appName: "Phonograph DEBUG"]
signingConfig signingConfigs.debug
}
}
@ -137,5 +132,5 @@ dependencies {
compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
compile 'com.github.kabouzeid:AppIntro:3.3.0k'
compile 'com.github.bumptech.glide:glide:3.6.1'
compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.2-kmod'
compile 'com.github.kabouzeid:RecyclerView-FastScroll:4a2754f1d6'
}