Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

updated patch and ci file

This commit is contained in:
Mariotaku Lee 2016-02-13 15:29:51 +08:00
parent 1f87eac50c
commit 323674900f
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -39,12 +39,13 @@ addons:
- patch - patch
before_install: 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 - 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 # Extracts build configs into source tree
- tar zxf travis/configs/twidere_private_config.tar.gz - tar zxf travis/configs/twidere_private_config.tar.gz
before_script:
# Validate if patches work # Validate if patches work
- patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch - patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch

48
twidere/patches/remove_closed_source_dependencies.patch
View File

@ -3,54 +3,60 @@ IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8 <+>UTF-8
=================================================================== ===================================================================
--- twidere/build.gradle (date 1454936651000) --- twidere/build.gradle (date 1455348383000)
+++ twidere/build.gradle (revision ) +++ twidere/build.gradle (revision )
@@ -3,20 +3,9 @@ @@ -3,17 +3,17 @@
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
-apply plugin: 'io.fabric' -apply plugin: 'io.fabric'
+//apply plugin: 'io.fabric'
apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'androidsvgdrawable' apply plugin: 'androidsvgdrawable'
-buildscript { buildscript {
- repositories { repositories {
- maven { url 'https://maven.fabric.io/public' } - maven { url 'https://maven.fabric.io/public' }
- } +// maven { url 'https://maven.fabric.io/public' }
- }
- dependencies {
- classpath 'io.fabric.tools:gradle:1.21.2'
- }
-}
-
android {
defaultConfig { dependencies {
@@ -36,7 +25,6 @@ - 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 targetCompatibility JavaVersion.VERSION_1_7
} }
productFlavors { productFlavors {
- google {} - google {}
+// google {}
fdroid {} fdroid {}
} }
buildTypes { buildTypes {
@@ -65,7 +53,6 @@ @@ -67,7 +67,7 @@
repositories { repositories {
maven { url 'https://s3.amazonaws.com/repo.commonsware.com' } maven { url 'https://s3.amazonaws.com/repo.commonsware.com' }
- maven { url 'https://maven.fabric.io/public' } - maven { url 'https://maven.fabric.io/public' }
+// maven { url 'https://maven.fabric.io/public' }
flatDir { dirs "$projectDir/lib" } flatDir { dirs "$projectDir/lib" }
} }
@@ -117,10 +104,6 @@ @@ -122,10 +122,10 @@
compile 'com.j256.simplemagic:simplemagic:1.6' compile project(':twidere.component.common')
compile 'com.github.mariotaku.MediaViewerLibrary:base:0.9.7' compile project(':twidere.component.nyan')
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.android.gms:play-services-maps:8.4.0'
- googleCompile 'com.google.maps.android:android-maps-utils:0.4' - googleCompile 'com.google.maps.android:android-maps-utils:0.4'
- googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true } - googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
- googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar' - 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' 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 \ No newline at end of file