diff --git a/.gitignore b/.gitignore index 9b7ecc2a..ce9ae759 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ local.properties # Mac .DS_Store + +# Private Keys +keystore.properties diff --git a/app/build.gradle b/app/build.gradle index eeae4466..1194affe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,9 +19,30 @@ repositories { android { + signingConfigs { + debug { + keyAlias 'phonograph-debug' + keyPassword 'debugkey' + storeFile file('../phonograph-debug.keystore') + storePassword 'debugkeystore' + } + release { + keyAlias 'phonograph' + storeFile file('../phonograph.keystore') + + // "keystore.properties" file containing the keystore passwords is needed in order to sign for release + File propFile = project.rootProject.file('keystore.properties') + if (propFile.exists()) { + Properties properties = new Properties() + properties.load(propFile.newDataInputStream()) + + keyPassword properties.getProperty('keyPassword') + storePassword properties.getProperty('storePassword') + } + } + } compileSdkVersion 22 buildToolsVersion '22.0.1' - defaultConfig { applicationId "com.kabouzeid.gramophone" minSdkVersion 16 @@ -29,16 +50,18 @@ android { versionCode 53 versionName "0.9.37b dev-1" } - buildTypes { release { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + } + debug { + signingConfig signingConfigs.debug } } - - lintOptions{ + lintOptions { disable 'MissingTranslation' } } @@ -48,7 +71,6 @@ dependencies { compile('com.crashlytics.sdk.android:crashlytics:2.2.1@aar') { transitive = true; } - compile 'com.android.support:support-v4:22.2.0' compile 'com.android.support:support-v13:22.2.0' compile 'com.android.support:appcompat-v7:22.2.0' @@ -59,11 +81,13 @@ dependencies { compile 'com.github.ksoichiro:android-observablescrollview:1.5.1' compile 'asia.ivity.android:drag-sort-listview:1.0' + compile 'de.hdodenhof:circleimageview:1.3.0' compile 'com.squareup.retrofit:retrofit:1.9.0' compile 'com.squareup.okhttp:okhttp:2.4.0' + compile 'com.squareup:otto:1.3.7' - compile 'de.hdodenhof:circleimageview:1.3.0' + compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' compile 'com.afollestad:material-dialogs:0.7.6.0' diff --git a/phonograph-debug.keystore b/phonograph-debug.keystore new file mode 100644 index 00000000..fb745e5d Binary files /dev/null and b/phonograph-debug.keystore differ