updated patches

This commit is contained in:
Mariotaku Lee 2016-05-14 11:06:12 +08:00
parent 490ca5c682
commit af79ff0255
1 changed files with 28 additions and 15 deletions

View File

@ -3,60 +3,73 @@ 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 1458458261000) --- twidere/build.gradle (date 1463193773000)
+++ twidere/build.gradle (revision ) +++ twidere/build.gradle (revision )
@@ -1,17 +1,17 @@ @@ -5,19 +5,19 @@
import fr.avianey.androidsvgdrawable.gradle.SvgDrawableTask apply plugin: 'androidsvgdrawable'
apply plugin: 'com.android.application' // START Non-FOSS component
-apply plugin: 'io.fabric' -apply plugin: 'io.fabric'
+//apply plugin: 'io.fabric' +//apply plugin: 'io.fabric'
apply plugin: 'com.neenbedankt.android-apt' // END Non-FOSS component
apply plugin: 'androidsvgdrawable'
buildscript { buildscript {
repositories { repositories {
// START Non-FOSS component
- maven { url 'https://maven.fabric.io/public' } - maven { url 'https://maven.fabric.io/public' }
+// maven { url 'https://maven.fabric.io/public' } +// maven { url 'https://maven.fabric.io/public' }
// END Non-FOSS component
} }
dependencies { dependencies {
// START Non-FOSS component
- classpath 'io.fabric.tools:gradle:1.21.5' - classpath 'io.fabric.tools:gradle:1.21.5'
+// classpath 'io.fabric.tools:gradle:1.21.5' +// classpath 'io.fabric.tools:gradle:1.21.5'
// END Non-FOSS component
} }
} }
@@ -49,7 +49,7 @@
@@ -41,7 +41,7 @@
}
productFlavors { productFlavors {
// START Non-FOSS component
- google {} - google {}
+// google {} +// google {}
// END Non-FOSS component
fdroid {} fdroid {}
} }
buildTypes { @@ -79,7 +79,7 @@
@@ -68,7 +68,7 @@
repositories { repositories {
maven { url 'https://s3.amazonaws.com/repo.commonsware.com' } maven { url 'https://s3.amazonaws.com/repo.commonsware.com' }
// START Non-FOSS component
- maven { url 'https://maven.fabric.io/public' } - maven { url 'https://maven.fabric.io/public' }
+// maven { url 'https://maven.fabric.io/public' } +// maven { url 'https://maven.fabric.io/public' }
// END Non-FOSS component
flatDir { dirs "$projectDir/lib" } flatDir { dirs "$projectDir/lib" }
} }
@@ -105,12 +105,12 @@
@@ -91,10 +91,10 @@
compile project(':twidere.component.common')
compile project(':twidere.component.nyan') compile project(':twidere.component.nyan')
// START Non-FOSS component
- googleCompile 'com.google.android.gms:play-services-maps:8.4.0' - googleCompile 'com.google.android.gms:play-services-maps:8.4.0'
- googleCompile 'com.google.android.gms:play-services-auth:8.4.0'
- googleCompile 'com.google.android.gms:play-services-measurement:8.4.0'
- googleCompile 'com.google.maps.android:android-maps-utils:0.4.3' - googleCompile 'com.google.maps.android:android-maps-utils:0.4.3'
- googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true } - googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
- googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar' - googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
+// googleCompile 'com.google.android.gms:play-services-maps:8.4.0' +// googleCompile 'com.google.android.gms:play-services-maps:8.4.0'
+// googleCompile 'com.google.android.gms:play-services-auth:8.4.0'
+// googleCompile 'com.google.android.gms:play-services-measurement:8.4.0'
+// googleCompile 'com.google.maps.android:android-maps-utils:0.4.3' +// googleCompile 'com.google.maps.android:android-maps-utils:0.4.3'
+// googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true } +// googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true }
+// googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar' +// googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
// END Non-FOSS component
fdroidCompile 'org.osmdroid:osmdroid-android:5.1' fdroidCompile 'org.osmdroid:osmdroid-android:5.1'
@@ -204,5 +204,5 @@
}
// 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 \ No newline at end of file