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

updated build script

This commit is contained in:
Mariotaku Lee 2016-02-08 22:04:07 +08:00
parent 9ea5b7feba
commit 4d81f3bf9d
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -36,16 +36,24 @@ addons:
packages: packages:
- python2.7 - python2.7
- libmagic1 - libmagic1
- patch
cache: #cache:
directories: # directories:
- $HOME/.local/opt # - $HOME/.local/opt
before_install: before_install:
- ./travis/scripts/extract_private_build_config.sh
- export PATH=$HOME/.local/bin:$PATH - export PATH=$HOME/.local/bin:$PATH
install:
- pip install -r ./travis/configs/requirements.txt --user - 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 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

18
twidere/patches/remove_closed_source_dependencies.patch
View File

@ -3,7 +3,7 @@ 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 1452393414000) --- twidere/build.gradle (date 1454936651000)
+++ twidere/build.gradle (revision ) +++ twidere/build.gradle (revision )
@@ -3,20 +3,9 @@ @@ -3,20 +3,9 @@
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@ -26,7 +26,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
android { android {
defaultConfig { defaultConfig {
@@ -39,7 +28,6 @@ @@ -36,7 +25,6 @@
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7
} }
productFlavors { productFlavors {
@ -34,7 +34,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
fdroid {} fdroid {}
} }
buildTypes { buildTypes {
@@ -66,7 +54,6 @@ @@ -65,7 +53,6 @@
repositories { repositories {
maven { url 'https://s3.amazonaws.com/repo.commonsware.com' } 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" } flatDir { dirs "$projectDir/lib" }
} }
@@ -116,10 +103,6 @@ @@ -117,10 +104,6 @@
compile 'com.google.dagger:dagger:2.0.2'
compile 'org.attoparser:attoparser:1.4.0.RELEASE'
compile 'com.j256.simplemagic:simplemagic:1.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.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'
fdroidCompile 'org.osmdroid:osmdroid-android:5.0.1' fdroidCompile 'org.osmdroid:osmdroid-android:5.1'
debugCompile 'com.facebook.stetho:stetho:1.2.0' debugCompile 'com.facebook.stetho:stetho:1.3.0'
debugCompile 'com.facebook.stetho:stetho-okhttp:1.2.0' debugCompile 'com.facebook.stetho:stetho-okhttp3:1.3.0'
\ No newline at end of file \ No newline at end of file