Merge pull request #313 from thermatk/fdroid

satisfy f-droid and change CI tasks for flavors
k0shk0sh · Apr 14, 2017 · 864d033 · 864d033
2 parents 6de5b7c + 1ab263d
commit 864d033
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,8 @@ jdk: oraclejdk8
 sudo: required
 
 script:
-  - ./gradlew clean assembleDebug
+  - ./gradlew clean assembleFdroidDebug
+  - ./gradlew clean assembleGmsDebug
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

diff --git a/app/build.gradle b/app/build.gradle
@@ -87,7 +87,6 @@ android {
     }
 
     configurations {
-        gmsReleaseCompile
         all*.exclude module: 'annotations'
     }
 }
@@ -144,8 +143,10 @@ dependencies {
     annotationProcessor "frankiesardo:icepick-processor:${icepickVersion}"
     annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
     provided "org.projectlombok:lombok:${lombokVersion}"
-    gmsCompile "com.google.firebase:firebase-ads:${firebase}"
-    gmsReleaseCompile "com.google.firebase:firebase-crash:${firebase}"
+    if (isGms) {
+        compile "com.google.firebase:firebase-ads:${firebase}"
+        releaseCompile "com.google.firebase:firebase-crash:${firebase}"
+    }
 }
 
 if (isGms) {

diff --git a/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java b/app/src/main/java/com/fastaccess/ui/widgets/recyclerview/BaseViewHolder.java
@@ -39,15 +39,15 @@ public BaseViewHolder(@NonNull View itemView, @Nullable BaseRecyclerAdapter adap
         itemView.setOnLongClickListener(this);
     }
 
-    @Override public void onClick(View v) {
+    @SuppressWarnings("unchecked") @Override public void onClick(View v) {
         if (adapter != null && adapter.getListener() != null) {
             int position = getAdapterPosition();
             if (position != RecyclerView.NO_POSITION && position < adapter.getItemCount())
                 adapter.getListener().onItemClick(position, v, adapter.getItem(position));
         }
     }
 
-    @Override public boolean onLongClick(View v) {
+    @SuppressWarnings("unchecked") @Override public boolean onLongClick(View v) {
         if (adapter != null && adapter.getListener() != null) {
             int position = getAdapterPosition();
             if (position != RecyclerView.NO_POSITION && position < adapter.getItemCount())