2016-01-10 03:39:59 +01:00
|
|
|
Index: twidere/build.gradle
|
|
|
|
IDEA additional info:
|
|
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
|
|
<+>UTF-8
|
|
|
|
===================================================================
|
2017-10-20 13:16:05 +02:00
|
|
|
--- twidere/build.gradle (date 1508497547000)
|
2017-06-20 03:44:12 +02:00
|
|
|
+++ twidere/build.gradle (revision )
|
2017-09-06 16:38:31 +02:00
|
|
|
@@ -20,7 +20,7 @@
|
2017-06-20 03:44:12 +02:00
|
|
|
}
|
|
|
|
|
2016-05-14 05:06:12 +02:00
|
|
|
// START Non-FOSS component
|
2017-06-20 03:44:12 +02:00
|
|
|
- classpath "com.google.gms:google-services:${pluginVersions['PlayServices']}"
|
|
|
|
+// classpath "com.google.gms:google-services:${pluginVersions['PlayServices']}"
|
2016-05-14 05:06:12 +02:00
|
|
|
// END Non-FOSS component
|
2017-06-20 03:44:12 +02:00
|
|
|
}
|
|
|
|
}
|
2017-09-06 16:38:31 +02:00
|
|
|
@@ -57,9 +57,9 @@
|
2016-01-10 03:39:59 +01:00
|
|
|
|
|
|
|
productFlavors {
|
2016-05-14 05:06:12 +02:00
|
|
|
// START Non-FOSS component
|
2017-08-14 06:38:33 +02:00
|
|
|
- google {
|
|
|
|
- dimension 'channel'
|
|
|
|
- }
|
|
|
|
+// google {
|
|
|
|
+// dimension 'channel'
|
|
|
|
+// }
|
2016-05-14 05:06:12 +02:00
|
|
|
// END Non-FOSS component
|
2017-08-14 06:38:33 +02:00
|
|
|
fdroid {
|
|
|
|
dimension 'channel'
|
2017-10-20 13:16:05 +02:00
|
|
|
@@ -159,15 +159,15 @@
|
2017-08-14 06:38:33 +02:00
|
|
|
implementation project(':twidere.component.nyan')
|
2016-02-13 08:29:51 +01:00
|
|
|
|
2016-05-14 05:06:12 +02:00
|
|
|
// START Non-FOSS component
|
2017-08-14 06:38:33 +02:00
|
|
|
- googleImplementation "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}"
|
|
|
|
- googleImplementation "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}"
|
2017-09-18 12:22:26 +02:00
|
|
|
- googleImplementation "com.google.android.gms:play-services-ads:${libVersions['PlayServices']}"
|
2017-08-14 06:38:33 +02:00
|
|
|
- googleImplementation "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}"
|
2017-10-20 13:16:05 +02:00
|
|
|
- googleImplementation "com.android.billingclient:billing:${libVersions['PlayBilling']}"
|
2017-08-14 06:38:33 +02:00
|
|
|
- googleImplementation "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}"
|
|
|
|
- googleImplementation("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") {
|
2017-01-22 07:57:39 +01:00
|
|
|
- exclude group: 'org.apache.httpcomponents'
|
|
|
|
- }
|
2017-08-14 06:38:33 +02:00
|
|
|
+// googleImplementation "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}"
|
|
|
|
+// googleImplementation "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}"
|
2017-09-18 12:22:26 +02:00
|
|
|
+// googleImplementation "com.google.android.gms:play-services-ads:${libVersions['PlayServices']}"
|
2017-08-14 06:38:33 +02:00
|
|
|
+// googleImplementation "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}"
|
2017-10-20 13:16:05 +02:00
|
|
|
+// googleImplementation "com.android.billingclient:billing:${libVersions['PlayBilling']}"
|
2017-08-14 06:38:33 +02:00
|
|
|
+// googleImplementation "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}"
|
|
|
|
+// googleImplementation("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") {
|
2017-01-22 07:57:39 +01:00
|
|
|
+// exclude group: 'org.apache.httpcomponents'
|
|
|
|
+// }
|
2016-05-14 05:06:12 +02:00
|
|
|
// END Non-FOSS component
|
2016-02-13 08:29:51 +01:00
|
|
|
|
2017-08-14 06:38:33 +02:00
|
|
|
fdroidImplementation "org.osmdroid:osmdroid-android:${libVersions['OSMDroid']}"
|
2017-10-20 13:16:05 +02:00
|
|
|
@@ -304,5 +304,5 @@
|
2017-09-23 16:15:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// START Non-FOSS component
|
|
|
|
-apply plugin: 'com.google.gms.google-services'
|
|
|
|
+//apply plugin: 'com.google.gms.google-services'
|
|
|
|
// END Non-FOSS component
|
|
|
|
\ No newline at end of file
|