updated patches

This commit is contained in:
Mariotaku Lee 2017-01-22 14:57:39 +08:00
parent 7eb3fb7cf1
commit e33ac9d70d
No known key found for this signature in database
GPG Key ID: 9C0706AE47FCE2AD
1 changed files with 15 additions and 7 deletions

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 1484982866000) --- twidere/build.gradle (date 1485067986000)
+++ twidere/build.gradle (revision ) +++ twidere/build.gradle (revision )
@@ -7,20 +7,20 @@ @@ -7,20 +7,20 @@
apply plugin: 'androidsvgdrawable' apply plugin: 'androidsvgdrawable'
@ -47,30 +47,38 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
// END Non-FOSS component // END Non-FOSS component
flatDir { dirs "$projectDir/lib" } flatDir { dirs "$projectDir/lib" }
} }
@@ -96,14 +96,14 @@ @@ -96,18 +96,18 @@
compile project(':twidere.component.nyan') compile project(':twidere.component.nyan')
// START Non-FOSS component // START Non-FOSS component
- googleCompile "com.google.android.gms:play-services-maps:$play_services_version" - 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.android.gms:play-services-auth:$play_services_version"
- googleCompile 'com.google.maps.android:android-maps-utils:0.4.4' - googleCompile 'com.google.maps.android:android-maps-utils:0.4.4'
- googleCompile("com.crashlytics.sdk.android:crashlytics:$crashlyrics_version@aar") { transitive = true } - googleCompile("com.crashlytics.sdk.android:crashlytics:$crashlyrics_version@aar") {
- transitive = true
- }
- googleCompile 'com.anjlab.android.iab.v3:library:1.0.38' - googleCompile 'com.anjlab.android.iab.v3:library:1.0.38'
- googleCompile "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version" - googleCompile "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version"
- googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar' - googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
- googleCompile "com.google.apis:google-api-services-drive:$google_api_drive_version" - googleCompile("com.google.apis:google-api-services-drive:$google_api_drive_version") {
- exclude group: 'org.apache.httpcomponents'
- }
+// googleCompile "com.google.android.gms:play-services-maps:$play_services_version" +// 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.android.gms:play-services-auth:$play_services_version"
+// googleCompile 'com.google.maps.android:android-maps-utils:0.4.4' +// googleCompile 'com.google.maps.android:android-maps-utils:0.4.4'
+// googleCompile("com.crashlytics.sdk.android:crashlytics:$crashlyrics_version@aar") { transitive = true } +// googleCompile("com.crashlytics.sdk.android:crashlytics:$crashlyrics_version@aar") {
+// transitive = true
+// }
+// googleCompile 'com.anjlab.android.iab.v3:library:1.0.38' +// googleCompile 'com.anjlab.android.iab.v3:library:1.0.38'
+// googleCompile "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version" +// googleCompile "com.dropbox.core:dropbox-core-sdk:$dropbox_core_sdk_version"
+// googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar' +// googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
+// googleCompile "com.google.apis:google-api-services-drive:$google_api_drive_version" +// googleCompile("com.google.apis:google-api-services-drive:$google_api_drive_version") {
+// exclude group: 'org.apache.httpcomponents'
+// }
// END Non-FOSS component // END Non-FOSS component
fdroidCompile 'org.osmdroid:osmdroid-android:5.5:release@aar' fdroidCompile 'org.osmdroid:osmdroid-android:5.5:release@aar'
@@ -214,5 +214,5 @@ @@ -218,5 +218,5 @@
} }
// START Non-FOSS component // START Non-FOSS component