From 323674900fa2148dde118ceb348accfe86327c03 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Sat, 13 Feb 2016 15:29:51 +0800
Subject: [PATCH] updated patch and ci file

---
 .travis.yml                                   |  5 +-
 .../remove_closed_source_dependencies.patch   | 48 +++++++++++--------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 831704166..b29e263fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,12 +39,13 @@ addons:
       - patch
 
 before_install:
-  - export PATH=$HOME/.local/bin:$PATH
   - openssl aes-256-cbc -K $encrypted_9b8203f9524d_key -iv $encrypted_9b8203f9524d_iv -in travis/configs/twidere_private_config.tar.gz.enc -out travis/configs/twidere_private_config.tar.gz -d
 
-before_script:
+install:
   # Extracts build configs into source tree
   - tar zxf travis/configs/twidere_private_config.tar.gz
+
+before_script:
   # Validate if patches work
   - patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch
 
diff --git a/twidere/patches/remove_closed_source_dependencies.patch b/twidere/patches/remove_closed_source_dependencies.patch
index 80b4f595d..fddcb221b 100644
--- a/twidere/patches/remove_closed_source_dependencies.patch
+++ b/twidere/patches/remove_closed_source_dependencies.patch
@@ -3,54 +3,60 @@ IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
---- twidere/build.gradle	(date 1454936651000)
+--- twidere/build.gradle	(date 1455348383000)
 +++ twidere/build.gradle	(revision )
-@@ -3,20 +3,9 @@
+@@ -3,17 +3,17 @@
  import java.text.SimpleDateFormat
  
  apply plugin: 'com.android.application'
 -apply plugin: 'io.fabric'
++//apply plugin: 'io.fabric'
  apply plugin: 'com.neenbedankt.android-apt'
  apply plugin: 'androidsvgdrawable'
  
--buildscript {
--    repositories {
+ buildscript {
+     repositories {
 -        maven { url 'https://maven.fabric.io/public' }
--    }
--
--    dependencies {
--        classpath 'io.fabric.tools:gradle:1.21.2'
--    }
--}
--
- android {
++//        maven { url 'https://maven.fabric.io/public' }
+     }
  
-     defaultConfig {
-@@ -36,7 +25,6 @@
+     dependencies {
+-        classpath 'io.fabric.tools:gradle:1.21.2'
++//        classpath 'io.fabric.tools:gradle:1.21.2'
+     }
+ }
+ 
+@@ -38,7 +38,7 @@
          targetCompatibility JavaVersion.VERSION_1_7
      }
      productFlavors {
 -        google {}
++//        google {}
          fdroid {}
      }
      buildTypes {
-@@ -65,7 +53,6 @@
+@@ -67,7 +67,7 @@
  
  repositories {
      maven { url 'https://s3.amazonaws.com/repo.commonsware.com' }
 -    maven { url 'https://maven.fabric.io/public' }
++//    maven { url 'https://maven.fabric.io/public' }
      flatDir { dirs "$projectDir/lib" }
  }
  
-@@ -117,10 +104,6 @@
-     compile 'com.j256.simplemagic:simplemagic:1.6'
-     compile 'com.github.mariotaku.MediaViewerLibrary:base:0.9.7'
-     compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.7'
+@@ -122,10 +122,10 @@
+     compile project(':twidere.component.common')
+     compile project(':twidere.component.nyan')
+ 
 -    googleCompile 'com.google.android.gms:play-services-maps:8.4.0'
 -    googleCompile 'com.google.maps.android:android-maps-utils:0.4'
 -    googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
 -    googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
++//    googleCompile 'com.google.android.gms:play-services-maps:8.4.0'
++//    googleCompile 'com.google.maps.android:android-maps-utils:0.4'
++//    googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
++//    googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
+ 
      fdroidCompile 'org.osmdroid:osmdroid-android:5.1'
-     debugCompile 'com.facebook.stetho:stetho:1.3.0'
-     debugCompile 'com.facebook.stetho:stetho-okhttp3:1.3.0'
+ 
 \ No newline at end of file