From 9dc9ee2ef0df7c0c7d325e9be1310c9f1c59b26a Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 25 Oct 2017 21:56:27 +0200 Subject: [PATCH] upgrade gradle version for android studio 3, fix some lint warnings --- app/build.gradle | 14 ++++++++++---- .../ic_notify.png | Bin .../ic_notify.png | Bin .../ic_notify.png | Bin .../ic_notify.png | Bin app/src/main/res/raw/keystore_tusky_api.bks | Bin 1402 -> 0 bytes build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 13 insertions(+), 7 deletions(-) rename app/src/main/res/{drawable-hdpi-v11 => drawable-hdpi}/ic_notify.png (100%) rename app/src/main/res/{drawable-mdpi-v11 => drawable-mdpi}/ic_notify.png (100%) rename app/src/main/res/{drawable-xhdpi-v11 => drawable-xhdpi}/ic_notify.png (100%) rename app/src/main/res/{drawable-xxhdpi-v11 => drawable-xxhdpi}/ic_notify.png (100%) delete mode 100644 app/src/main/res/raw/keystore_tusky_api.bks diff --git a/app/build.gradle b/app/build.gradle index f8f3c07f4..1fd1e56d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.keylesspalace.tusky" minSdkVersion 15 @@ -19,9 +19,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + flavorDimensions "store" productFlavors { - google {} - fdroid {} + google { + dimension "store" + } + fdroid { + dimension "store" + } } lintOptions { disable 'MissingTranslation' @@ -60,7 +66,7 @@ dependencies { //room compile "android.arch.persistence.room:runtime:1.0.0-rc1" - annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-beta2' + annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-rc1' testCompile "junit:junit:4.12" androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { diff --git a/app/src/main/res/drawable-hdpi-v11/ic_notify.png b/app/src/main/res/drawable-hdpi/ic_notify.png similarity index 100% rename from app/src/main/res/drawable-hdpi-v11/ic_notify.png rename to app/src/main/res/drawable-hdpi/ic_notify.png diff --git a/app/src/main/res/drawable-mdpi-v11/ic_notify.png b/app/src/main/res/drawable-mdpi/ic_notify.png similarity index 100% rename from app/src/main/res/drawable-mdpi-v11/ic_notify.png rename to app/src/main/res/drawable-mdpi/ic_notify.png diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_notify.png b/app/src/main/res/drawable-xhdpi/ic_notify.png similarity index 100% rename from app/src/main/res/drawable-xhdpi-v11/ic_notify.png rename to app/src/main/res/drawable-xhdpi/ic_notify.png diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_notify.png b/app/src/main/res/drawable-xxhdpi/ic_notify.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi-v11/ic_notify.png rename to app/src/main/res/drawable-xxhdpi/ic_notify.png diff --git a/app/src/main/res/raw/keystore_tusky_api.bks b/app/src/main/res/raw/keystore_tusky_api.bks deleted file mode 100644 index bc47c33175a173a076471054abd5f4c710e1776f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1402 zcmaJ=eM}Q)9KQE@E#Dxt76uef5D=C2rHoA6B7=!KhLb9&LsNGgM|-sPN_)VnGHg-& zh`8aVF^Uyrpw$gsj1~wHhO;BOVPFGiB2%0&14Lp_5OlcfRDvekU+??;-skz{d4C@W zf}jY3i0a2}A5UbDyLCUF^l^>aHE_C+O+*mvM}YVcdYUaTYE05>1EZk~2m&_BnR}-= z6@u{BOXFbzcLqZXKLA=Vq>6_E6!qhwbxW3(dvs4l=4|Xe{MPky8}t&m%`aO~Htq$0 z2Ooi{u^!M(z{|u0LNs$ttQd-%z+LE-MzK*wJVi$uOnNpp9L{mZdBVWg;&@U4t7Z%| zYr@yZ!4QA1*mq#OTrQ7|kApDlU${sPUqTo$BhB=8G?Yn88I5{EOOTY5WHv(!2%G5= z@DZK`_#j-|9kl>}oDYjp4ma-4P*%pzA8WA+y{``pwk_N{c=6s~)KK+@^0OO!t?NEI z_k5(){lt;}K5MX6K^$#=cBWi|+G>V&j5u7|9Y?~xFNF7_i%)h|P3;!-?P%Ae%(}r2 zKB$tcl638xJ4q=;zg@4cKYjk(@wG>)7u_j-Vr*u*zoUy3x1w{2->LgMR#)WIwe|nJ z+i`VQmwW7!pAP%qot(Ne(VM<;G;iqr(4rIN*tY={<^IWzRoQLVgv)~Wv<+{oZMdR; z669$wzoxkSxA*emnjcCM<2TFqSKB8}evzCq?3r-3kMC=_o{Aki9W6COZ7ss+2KVLvBioi+yQO(^*N$78vRzhhqUyyj^rEHIKxK zdz%J26YO;<)X3Mo&n;}4_1teu)|5Fg*wB(D0z+g+@|ICni%E`kq^B6RbLRW!6W%dLpfaU>#2Uisg zSZ;Gg;BXI&eB~Jh;=q@lNxkt+uh4vEnutQP)zf@5Lroj;4>-4UE=>|Fg>NQIIHS{= z@N5bt0}FC)~WDxf}>MLoY3XGpwc>=AW6oML+D5fFQQpB&Z?=` z(xx+7nl$0LOaUh%SlnsS$W`{uY8og#W29NeV3N&TAa2dM1p>%>Y|*uI(L9Cp7kg=G za7TUS1f3*Yy?4W(=f4c=DDOdAByQb+wZPL+!}4I z`HwUw4@gSTw4nSsj=4!2j?H_VJJvdIJX5kVaQU%({7{Ea_!bZQua$wR4`(e{;#>Ol z+6yauypu;qsvM4s>ekuT2P^eYTOOe6PE>YCV*LMVvaN9}F5QOpY4U~@o0fe-+@Gz# zvgy*)yQ>VeCsdv Mhsw4d^t&+e4+K5{Bme*a diff --git a/build.gradle b/build.gradle index 24700cb00..866a02f78 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19330f4dd..954dff793 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 06 17:29:49 CET 2017 +#Wed Oct 25 20:21:12 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip