From 8ada926a1fb7a4c3d4217252395e3776dd236eb4 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Sat, 4 Mar 2017 13:04:03 +0800
Subject: [PATCH] updated patches

---
 .../remove_closed_source_dependencies.patch   | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/twidere/patches/remove_closed_source_dependencies.patch b/twidere/patches/remove_closed_source_dependencies.patch
index b12fe71a5..051570d4b 100644
--- a/twidere/patches/remove_closed_source_dependencies.patch
+++ b/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 1485319229000)
+--- twidere/build.gradle	(date 1488603761000)
 +++ twidere/build.gradle	(revision )
 @@ -7,20 +7,20 @@
  apply plugin: 'androidsvgdrawable'
@@ -24,11 +24,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  
      dependencies {
          // START Non-FOSS component
--        classpath "io.fabric.tools:gradle:$fabric_plugin_version"
-+//        classpath "io.fabric.tools:gradle:$fabric_plugin_version"
+-        classpath "io.fabric.tools:gradle:${libVersions["FabricPlugin"]}"
++//        classpath "io.fabric.tools:gradle:${libVersions["FabricPlugin"]}"
          // END Non-FOSS component
  
-         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${libVersions['Kotlin']}"
 @@ -50,7 +50,7 @@
  
      productFlavors {
@@ -38,7 +38,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
          // END Non-FOSS component
          fdroid {}
      }
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
      mavenLocal()
      maven { url 'https://s3.amazonaws.com/repo.commonsware.com' }
      // START Non-FOSS component
@@ -47,36 +47,36 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
      // END Non-FOSS component
      flatDir { dirs "$projectDir/lib" }
  }
-@@ -96,17 +96,17 @@
+@@ -98,17 +98,17 @@
      compile project(':twidere.component.nyan')
  
      // START Non-FOSS component
--    googleCompile "com.google.android.gms:play-services-maps:$play_services_version"
--    googleCompile "com.google.android.gms:play-services-auth:$play_services_version"
--    googleCompile 'com.google.maps.android:android-maps-utils:0.4.4'
--    googleCompile("com.crashlytics.sdk.android:crashlytics:$crashlyrics_version@aar") {
+-    googleCompile "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}"
+-    googleCompile "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}"
+-    googleCompile "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}"
+-    googleCompile("com.crashlytics.sdk.android:crashlytics:${libVersions['Crashlyrics']}@aar") {
 -        transitive = true
 -    }
--    googleCompile 'com.anjlab.android.iab.v3:library:1.0.38'
--    googleCompile "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version"
--    googleCompile("com.google.apis:google-api-services-drive:$google_api_drive_version") {
+-    googleCompile "com.anjlab.android.iab.v3:library:${libVersions['IABv3']}"
+-    googleCompile "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}"
+-    googleCompile("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") {
 -        exclude group: 'org.apache.httpcomponents'
 -    }
-+//    googleCompile "com.google.android.gms:play-services-maps:$play_services_version"
-+//    googleCompile "com.google.android.gms:play-services-auth:$play_services_version"
-+//    googleCompile 'com.google.maps.android:android-maps-utils:0.4.4'
-+//    googleCompile("com.crashlytics.sdk.android:crashlytics:$crashlyrics_version@aar") {
++//    googleCompile "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}"
++//    googleCompile "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}"
++//    googleCompile "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}"
++//    googleCompile("com.crashlytics.sdk.android:crashlytics:${libVersions['Crashlyrics']}@aar") {
 +//        transitive = true
 +//    }
-+//    googleCompile 'com.anjlab.android.iab.v3:library:1.0.38'
-+//    googleCompile "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version"
-+//    googleCompile("com.google.apis:google-api-services-drive:$google_api_drive_version") {
++//    googleCompile "com.anjlab.android.iab.v3:library:${libVersions['IABv3']}"
++//    googleCompile "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}"
++//    googleCompile("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") {
 +//        exclude group: 'org.apache.httpcomponents'
 +//    }
      // END Non-FOSS component
  
-     fdroidCompile 'org.osmdroid:osmdroid-android:5.5:release@aar'
-@@ -218,5 +218,5 @@
+     fdroidCompile 'org.osmdroid:osmdroid-android:5.6.4'
+@@ -224,5 +224,5 @@
  }
  
  // START Non-FOSS component