Merge pull request #797 from mariotaku/develop

Updated version

.travis.yml

@@ -47,14 +47,14 @@ cache:
     - $HOME/.m2/
 
 before_install:
-  - 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
+  - ./travis/scripts/decode_private_configs.sh
 
 install:
   - ./travis/scripts/fetch_private_files.sh
 
 before_script:
   # Validate if patches work
-  - patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch
+  - ./travis/scripts/patch_sources.sh
   # Validate if Google components fetched successfully
   - ./travis/scripts/test_private_files.sh
 
@@ -78,4 +78,4 @@ deploy:
     script: ./gradlew publishGoogleRelease
     on:
       repo: TwidereProject/Twidere-Android
-      tags: true
+      tags: true

travis/scripts/decode_private_configs.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    echo "Skipped for pull request"
+    exit 0
+fi
+
+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

travis/scripts/fetch_private_files.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-      return 0
+    echo "Skipped for pull request"
+    exit 0
 fi
 
 # Extracts build configs into source tree
@@ -19,4 +20,4 @@ ssh-agent bash -c "ssh-add private/ssh_id_rsa; git clone $COMPONENT_GOOGLE_REPO
 # Force reset to required commit id
 git -C twidere/src/google reset --hard `cat twidere/src/.google.commit-id` > /dev/null 2>&1
 # Dropbox accessToken for uploading logs
-cat private/dropbox_uploader >> ~/.dropbox_uploader
+cat private/dropbox_uploader >> ~/.dropbox_uploader

travis/scripts/patch_sources.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    echo "Apply real patch for pull request"
+    patch -d twidere < twidere/patches/remove_closed_source_dependencies.patch
+else  
+    patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch
+fi

travis/scripts/test_private_files.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-    return 0
+    echo "Skipped for pull request"
+    exit 0
 fi
 
-test -f twidere/src/google/AndroidManifest.xml
+test -f twidere/src/google/AndroidManifest.xml

travis/scripts/upload_error_logs.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-      return 0
+    echo "Skipped for pull request"
+    exit 0
 fi
 
 curl 'https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh' -o travis/scripts/dropbox_uploader.sh
 chmod +x travis/scripts/dropbox_uploader.sh
 find /tmp -maxdepth 1 -name 'kotlin-daemon.*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/$(basename $1)' find-sh {} \;
 find ~/.gradle/daemon/ -name 'daemon-*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/gradle-$(basename $1)' find-sh {} \;
-dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log ${TRAVIS_BUILD_ID}/dmesg.log
+dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log ${TRAVIS_BUILD_ID}/dmesg.log

twidere/build.gradle

@@ -41,8 +41,8 @@ android {
         applicationId "org.mariotaku.twidere"
         minSdkVersion project.properties['overrideMinSdkVersion'] ?: 14
         targetSdkVersion 25
-        versionCode 347
-        versionName '3.5.30'
+        versionCode 348
+        versionName '3.5.31'
         multiDexEnabled true
 
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'
@@ -247,4 +247,4 @@ play {
 
 // START Non-FOSS component
 apply plugin: 'com.google.gms.google-services'
-// END Non-FOSS component
+// END Non-FOSS component

twidere/patches/remove_closed_source_dependencies.patch

@@ -3,9 +3,9 @@ IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
---- twidere/build.gradle	(date 1489569483000)
-+++ twidere/build.gradle	(revision )
-@@ -7,22 +7,22 @@
+--- twidere/build.gradle        (date 1493143158000)
++++ twidere/build.gradle        (revision )
+@@ -7,23 +7,23 @@ apply plugin: 'kotlin-android-extensions'
  apply plugin: 'androidsvgdrawable'
  
  // START Non-FOSS component
@@ -28,12 +28,14 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
          // START Non-FOSS component
 -        classpath "io.fabric.tools:gradle:${libVersions['FabricPlugin']}"
 -        classpath "com.github.triplet.gradle:play-publisher:${libVersions['PlayPublisher']}"
+-        classpath 'com.google.gms:google-services:3.0.0'
 +//        classpath "io.fabric.tools:gradle:${libVersions['FabricPlugin']}"
 +//        classpath "com.github.triplet.gradle:play-publisher:${libVersions['PlayPublisher']}"
++//        classpath 'com.google.gms:google-services:3.0.0'
          // END Non-FOSS component
  
          classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${libVersions['Kotlin']}"
-@@ -52,7 +52,7 @@
+@@ -56,7 +56,7 @@ android {
  
      productFlavors {
          // START Non-FOSS component
@@ -42,7 +44,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
          // END Non-FOSS component
          fdroid {}
      }
-@@ -84,7 +84,7 @@
+@@ -88,7 +88,7 @@ repositories {
      mavenLocal()
      maven { url 'https://s3.amazonaws.com/repo.commonsware.com' }
      // START Non-FOSS component
@@ -51,7 +53,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
      // END Non-FOSS component
      flatDir { dirs "$projectDir/lib" }
  }
-@@ -100,17 +100,17 @@
+@@ -104,17 +104,17 @@ dependencies {
      compile project(':twidere.component.nyan')
  
      // START Non-FOSS component
@@ -79,8 +81,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 +//    }
      // END Non-FOSS component
  
-     fdroidCompile 'org.osmdroid:osmdroid-android:5.6.4'
-@@ -229,12 +229,12 @@
+     fdroidCompile "org.osmdroid:osmdroid-android:${libVersions['OSMDroid']}"
+@@ -239,12 +239,12 @@ task svgToMipmap(type: SvgDrawableTask) {
  }
  
  // START Non-FOSS component
@@ -98,4 +100,3 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 -apply plugin: 'com.google.gms.google-services'
 +//apply plugin: 'com.google.gms.google-services'
  // END Non-FOSS component
-\ No newline at end of file