updated build script

.travis.yml

@@ -36,16 +36,24 @@ addons:
     packages:
       - python2.7
       - libmagic1
+      - patch
 
-cache:
-  directories:
-  - $HOME/.local/opt
+#cache:
+#  directories:
+#  - $HOME/.local/opt
 
 before_install:
-  - ./travis/scripts/extract_private_build_config.sh
   - export PATH=$HOME/.local/bin:$PATH
+
+install:
   - pip install -r ./travis/configs/requirements.txt --user
 
+before_script:
+  # This extracts build configs into source tree
+  - ./travis/scripts/extract_private_build_config.sh
+  # Validate if patches work
+  - patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch
+
 script: ./gradlew build --no-daemon --stacktrace
 
-after_success: ./travis/scripts/travis_upload_release_to_github.py
+after_success: ./travis/scripts/travis_upload_release_to_github.py

twidere/patches/remove_closed_source_dependencies.patch

@@ -3,7 +3,7 @@ IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
---- twidere/build.gradle	(date 1452393414000)
+--- twidere/build.gradle	(date 1454936651000)
 +++ twidere/build.gradle	(revision )
 @@ -3,20 +3,9 @@
  import java.text.SimpleDateFormat
@@ -26,7 +26,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  android {
  
      defaultConfig {
-@@ -39,7 +28,6 @@
+@@ -36,7 +25,6 @@
          targetCompatibility JavaVersion.VERSION_1_7
      }
      productFlavors {
@@ -34,7 +34,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
          fdroid {}
      }
      buildTypes {
-@@ -66,7 +54,6 @@
+@@ -65,7 +53,6 @@
  
  repositories {
      maven { url 'https://s3.amazonaws.com/repo.commonsware.com' }
@@ -42,15 +42,15 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
      flatDir { dirs "$projectDir/lib" }
  }
  
-@@ -116,10 +103,6 @@
-     compile 'com.google.dagger:dagger:2.0.2'
-     compile 'org.attoparser:attoparser:1.4.0.RELEASE'
+@@ -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'
 -    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.0.1'
-     debugCompile 'com.facebook.stetho:stetho:1.2.0'
-     debugCompile 'com.facebook.stetho:stetho-okhttp:1.2.0'
+     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