From a9e2af0a4df5b99f23e2309a9076fbfb576e792b Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Mon, 6 Jul 2015 01:15:09 +0200 Subject: [PATCH] Included debug and release keystores. Release keystore is only usable with "keystore.properties" file which includes the passwords. --- .gitignore | 3 +++ app/build.gradle | 36 ++++++++++++++++++++++++++++++------ phonograph-debug.keystore | Bin 0 -> 1370 bytes 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 phonograph-debug.keystore 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 0000000000000000000000000000000000000000..fb745e5d8852e75d4e8b8be35fb3ac557f6c2968 GIT binary patch literal 1370 zcmezO_TO6u1_mYu1_nkj7AVNb&&y9QN-W6GO-W5EO=n-@fqa zEf2SFd65Y^&tk9cR(jc7dPGMevoSqq%azTYOO8pV@)&+l%Utm6mP*}x>u(*i#dc5o zcIB4d`8GFRcIzeeRk^`VicjvdnX&MS%n#jrA?K-tknmwwv40Qbv~PDk`p9v8yOi6On;Uo1;mAyTl*_-oz{^DojL&zt(>-1dsET>o%m;;s`LoHPw{WcXX3Ui!bv zU$sJyyRCb&?L)V7C59VjGe6sq#l)V&@G3FpxYPa>ku&^fcl%WY?Ya2YI40WB+^wZv zexZg!r0m%vJGP~?l*oBRK2By_^Y~qC)YCu5IQ(-;a+8DPHA~WVeqqxLSte0->cc}W z+m4p%be<$HCb4A(-1WEn_HZ)2w)uNQ)pGl#S^F;Z@JN^1a1?&=$ab_oe&-`wSFhoG zzlZNX%@ErWdWR>P=@V;X_&58K`~EebvTkIV3EkUm{~`TuY^n44t!$e$!}%sEZ2ZU+ zdX+U>t<7!C>3aUjZ;Kwk&w80-7-V<$t&r+Fxw8xX_UkbG=XTl`aW%~L=nGrhovT@O zrg=^L_3~ix#i=23<|pE}MOaV1XI@fndHnR$5U!?oG9q?71xyzj4IAHV-o7kxx$~^^ zj`sDM{W+p$``7Q1;gIU<{}UQ}OZmGXFWc9yxcd{kK7Tvbn}6lLEOvXu^IbOg z(&q^w=QM7{O=HOAH_3{6FYEPPYe)LuhRwli3^_AiRIlWf%DJkeelEzde8HcHuiLM0 z0HiW?_CbB?fZhyoRO*<_4xlhNi}b#!=$DCI$v( zMix*mJ)P1xA2}QtSs9ocdl?KGJDD0A85Zl=bwusq_0vWTgKl5id9kFjZo4&N>!#csFx79q>FDp1#G@SJ@jtj}nzmR?R zc%Cg2Ga~~dvh!F$&TC`{cMY4Wn7-idS?@nHE==A!wYmCI(-fxZnw>n-%1hjCG#4@! z`s+)sTd#Ul$NrGG?gC>m6Vc^f`jfw375%{xsj=z(F`;vol~TUXs{`cwTl0}fs7vOwh7Bt_`g$4=PgdK_##wVT)19rb){?D T*H@u&5jVQ-e0p+VUf4STBFHB* literal 0 HcmV?d00001