diff --git a/.gitignore b/.gitignore index 20e16e293..b59a81640 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ ehthumbs.db Thumbs.db # Private files -/signing.properties \ No newline at end of file +/signing.properties +/twidere.jks \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 7e3be2940..b436b9894 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,16 +44,12 @@ addons: before_install: - export PATH=$HOME/.local/bin:$PATH - -install: - - pip install -r ./travis/configs/requirements.txt --user + - 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: - # This extracts build configs into source tree - - ./travis/scripts/extract_private_build_config.sh + # Extracts build configs into source tree + - tar zxf travis/configs/twidere_private_config.tar.gz # 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 \ No newline at end of file diff --git a/patchlib_rules.yml b/patchlib_rules.yml deleted file mode 100644 index df15e1d69..000000000 --- a/patchlib_rules.yml +++ /dev/null @@ -1,13 +0,0 @@ -com/bluelinelabs/logansquare/LoganSquare: - fields: - OBJECT_MAPPERS: - modifiers: +public - PARAMETERIZED_OBJECT_MAPPERS: - modifiers: +public - methods: - getMapper: - modifiers: +public -android/support/v7/widget/ActionMenuPresenter: - fields: - mOverflowButton: - modifiers: -private \ No newline at end of file diff --git a/travis/configs/.gitignore b/travis/configs/.gitignore new file mode 100644 index 000000000..68437eefe --- /dev/null +++ b/travis/configs/.gitignore @@ -0,0 +1 @@ +/twidere_private_config.tar.gz \ No newline at end of file diff --git a/travis/configs/twidere_private_config.tar.gz.enc b/travis/configs/twidere_private_config.tar.gz.enc new file mode 100644 index 000000000..412ddcf25 Binary files /dev/null and b/travis/configs/twidere_private_config.tar.gz.enc differ