Commit 36c7c066 authored by Mala's avatar Mala

gradle removing extra space and unnecessary dependencies

parent 839c67c5
...@@ -11,11 +11,9 @@ buildscript { ...@@ -11,11 +11,9 @@ buildscript {
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
} }
} }
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
...@@ -33,12 +31,8 @@ android { ...@@ -33,12 +31,8 @@ android {
} }
} }
} }
dependencies { dependencies {
compile project(':log-wrapper') compile project(':log-wrapper')
compile extraDependencies.okHTTP compile extraDependencies.okHTTP
compile extraDependencies.rxJava compile extraDependencies.rxJava
compile extraDependencies.boltTask compile extraDependencies.boltTask
......
package chat.rocket.android_ddp; package chat.rocket.android_ddp;
import android.support.annotation.Nullable;
import io.reactivex.Flowable;
import io.reactivex.Maybe;
import io.reactivex.annotations.Nullable;
import org.json.JSONArray; import org.json.JSONArray;
import bolts.Task; import bolts.Task;
import bolts.TaskCompletionSource; import bolts.TaskCompletionSource;
import chat.rocket.android_ddp.rx.RxWebSocketCallback; import chat.rocket.android_ddp.rx.RxWebSocketCallback;
import io.reactivex.Flowable;
import io.reactivex.Maybe;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
public class DDPClient { public class DDPClient {
......
...@@ -22,7 +22,6 @@ buildscript { ...@@ -22,7 +22,6 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:2.3.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
classpath 'me.tatarka:gradle-retrolambda:3.5.0' classpath 'me.tatarka:gradle-retrolambda:3.5.0'
...@@ -115,7 +114,6 @@ play { ...@@ -115,7 +114,6 @@ play {
jsonFile = file('rocket-chat.json') jsonFile = file('rocket-chat.json')
track = "${track}" track = "${track}"
} }
ext { ext {
playLibVersion = '11.0.4' playLibVersion = '11.0.4'
stethoVersion = '1.5.0' stethoVersion = '1.5.0'
...@@ -133,24 +131,15 @@ dependencies { ...@@ -133,24 +131,15 @@ dependencies {
compile project(':rocket-chat-core') compile project(':rocket-chat-core')
compile project(':rocket-chat-android-widgets') compile project(':rocket-chat-android-widgets')
compile project(':persistence-realm') compile project(':persistence-realm')
compile extraDependencies.circleImageView;
compile extraDependencies.okHTTP compile extraDependencies.okHTTP
compile extraDependencies.rxJava compile extraDependencies.rxJava
compile extraDependencies.boltTask compile extraDependencies.boltTask
compile extraDependencies.textDrawable
compile supportDependencies.appCompat
compile supportDependencies.designSupportLibrary compile supportDependencies.designSupportLibrary
compile supportDependencies.annotation compile supportDependencies.annotation
compile supportDependencies.constrainLayout
compile supportDependencies.kotlin; compile supportDependencies.kotlin;
compile rxbindingDependencies.rxBinding compile rxbindingDependencies.rxBinding
compile rxbindingDependencies.rxBindingSupport compile rxbindingDependencies.rxBindingSupport
compile rxbindingDependencies.rxBindingAppcompact compile rxbindingDependencies.rxBindingAppcompact
compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:multidex:1.0.1'
compile "com.google.firebase:firebase-core:$playLibVersion" compile "com.google.firebase:firebase-core:$playLibVersion"
compile "com.google.firebase:firebase-crash:$playLibVersion" compile "com.google.firebase:firebase-crash:$playLibVersion"
...@@ -158,25 +147,18 @@ dependencies { ...@@ -158,25 +147,18 @@ dependencies {
debugCompile "com.facebook.stetho:stetho:$stethoVersion" debugCompile "com.facebook.stetho:stetho:$stethoVersion"
debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoOkhttp3Version" debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoOkhttp3Version"
debugCompile "com.uphyca:stetho_realm:$stethoRealmVersion" debugCompile "com.uphyca:stetho_realm:$stethoRealmVersion"
compile "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion" compile "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion"
compile "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion" compile "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion"
compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion" compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
compile 'nl.littlerobots.rxlint:rxlint:1.2' compile 'nl.littlerobots.rxlint:rxlint:1.2'
compile "frankiesardo:icepick:$icepickVersion" compile "frankiesardo:icepick:$icepickVersion"
provided "frankiesardo:icepick-processor:$icepickVersion" provided "frankiesardo:icepick-processor:$icepickVersion"
compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion" compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion" annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
transitive = true; transitive = true;
} }
debugCompile "com.tspoon.traceur:traceur:1.0.1"
compile 'com.aurelhubert:ahbottomnavigation:2.0.6' compile 'com.aurelhubert:ahbottomnavigation:2.0.6'
compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6@aar') { compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6@aar') {
transitive = true transitive = true
...@@ -184,24 +166,15 @@ dependencies { ...@@ -184,24 +166,15 @@ dependencies {
compile 'com.github.JakeWharton:ViewPagerIndicator:2.4.1@aar' compile 'com.github.JakeWharton:ViewPagerIndicator:2.4.1@aar'
compile 'com.jakewharton:butterknife:8.5.1' compile 'com.jakewharton:butterknife:8.5.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.timber:timber:4.5.1'
compile 'com.github.matrixxun:MaterialBadgeTextView:c5a27e8243' compile 'com.github.matrixxun:MaterialBadgeTextView:c5a27e8243'
compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.github.chrisbanes:PhotoView:2.0.0'
// Full Screen Dialogue libs
//compile 'com.github.franmontiel:FullScreenDialog:1.0.1'
provided 'io.reactivex:rxjava:1.3.0' provided 'io.reactivex:rxjava:1.3.0'
provided "com.github.akarnokd:rxjava2-interop:0.10.2" provided "com.github.akarnokd:rxjava2-interop:0.10.2"
provided 'com.hadisatrio:Optional:v1.0.1' provided 'com.hadisatrio:Optional:v1.0.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile "org.mockito:mockito-core:2.7.19" testCompile "org.mockito:mockito-core:2.7.19"
testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
} }
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
ext { ext {
preDexLibs = "true" != System.getenv("CI") preDexLibs = "true" != System.getenv("CI")
supportLibraryVersion = "25.4.0" supportLibraryVersion = "25.4.0"
constraintLayoutVersion = "1.0.2" constraintLayoutVersion = "1.0.2"
kotlinVersion = "1.1.4-2" kotlinVersion = "1.1.4-2"
okHttpVersion = "3.9.0" okHttpVersion = "3.9.0"
rxbindingVersion = '2.0.0' rxbindingVersion = '2.0.0'
supportDependencies = [ supportDependencies = [
appCompat : "com.android.support:appcompat-v7:${supportLibraryVersion}",
designSupportLibrary: "com.android.support:design:${supportLibraryVersion}", designSupportLibrary: "com.android.support:design:${supportLibraryVersion}",
annotation : "com.android.support:support-annotations:${supportLibraryVersion}", annotation : "com.android.support:support-annotations:${supportLibraryVersion}",
constrainLayout : "com.android.support.constraint:constraint-layout:${constraintLayoutVersion}", constrainLayout : "com.android.support.constraint:constraint-layout:${constraintLayoutVersion}",
kotlin : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}", kotlin : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}",
cardView : "com.android.support:cardview-v7:${supportLibraryVersion}", cardView : "com.android.support:cardview-v7:${supportLibraryVersion}",
supportV4 : "com.android.support:support-v4:${supportLibraryVersion}",
recycleview : "com.android.support:recyclerview-v7:${supportLibraryVersion}",
cardview : "com.android.support:cardview-v7:${supportLibraryVersion}",
] ]
extraDependencies = [ extraDependencies = [
circleImageView: "de.hdodenhof:circleimageview:1.2.1",
okHTTP : "com.squareup.okhttp3:okhttp:3.8.0", okHTTP : "com.squareup.okhttp3:okhttp:3.8.0",
rxJava : "io.reactivex.rxjava2:rxjava:2.1.0", rxJava : "io.reactivex.rxjava2:rxjava:2.1.0",
boltTask : "com.parse.bolts:bolts-tasks:1.4.0", boltTask : "com.parse.bolts:bolts-tasks:1.4.0",
textDrawable : "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1", textDrawable : "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1",
rxAndroid : "io.reactivex.rxjava2:rxandroid:2.0.1" rxAndroid : "io.reactivex.rxjava2:rxandroid:2.0.1"
] ]
rxbindingDependencies = [ rxbindingDependencies = [
rxBinding : "com.jakewharton.rxbinding2:rxbinding:${rxbindingVersion}", rxBinding : "com.jakewharton.rxbinding2:rxbinding:${rxbindingVersion}",
rxBindingSupport : "com.jakewharton.rxbinding2:rxbinding-support-v4:${rxbindingVersion}", rxBindingSupport : "com.jakewharton.rxbinding2:rxbinding-support-v4:${rxbindingVersion}",
rxBindingAppcompact: "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:${rxbindingVersion}", rxBindingAppcompact: "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:${rxbindingVersion}",
] ]
} }
subprojects { subprojects {
project.plugins.whenPluginAdded { plugin -> project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.AppPlugin" == plugin.class.name) { if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
......
...@@ -8,11 +8,9 @@ buildscript { ...@@ -8,11 +8,9 @@ buildscript {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:2.3.3'
} }
} }
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
......
...@@ -44,31 +44,20 @@ android { ...@@ -44,31 +44,20 @@ android {
androidTest.java.srcDirs += 'src/androidTest/kotlin' androidTest.java.srcDirs += 'src/androidTest/kotlin'
} }
} }
dependencies { dependencies {
compile project(':log-wrapper') compile project(':log-wrapper')
compile project(':rocket-chat-core') compile project(':rocket-chat-core')
compile extraDependencies.rxJava compile extraDependencies.rxJava
compile extraDependencies.boltTask compile extraDependencies.boltTask
compile supportDependencies.annotation compile supportDependencies.annotation
compile supportDependencies.appCompat
compile supportDependencies.designSupportLibrary compile supportDependencies.designSupportLibrary
compile supportDependencies.kotlin compile supportDependencies.kotlin
compile extraDependencies.rxAndroid compile extraDependencies.rxAndroid
testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
testCompile 'org.json:json:20170516' testCompile 'org.json:json:20170516'
testCompile 'org.skyscreamer:jsonassert:1.5.0' testCompile 'org.skyscreamer:jsonassert:1.5.0'
compile 'com.github.akarnokd:rxjava2-interop:0.10.0' compile 'com.github.akarnokd:rxjava2-interop:0.10.0'
provided 'com.hadisatrio:Optional:v1.0.1' provided 'com.hadisatrio:Optional:v1.0.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }
...@@ -12,7 +12,6 @@ buildscript { ...@@ -12,7 +12,6 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
} }
} }
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
...@@ -43,38 +42,25 @@ ext { ...@@ -43,38 +42,25 @@ ext {
frescoVersion = '1.4.0' frescoVersion = '1.4.0'
rxbindingVersion = '2.0.0' rxbindingVersion = '2.0.0'
} }
dependencies { dependencies {
compile project(':rocket-chat-core') compile project(':rocket-chat-core')
compile extraDependencies.circleImageView;
compile extraDependencies.okHTTP; compile extraDependencies.okHTTP;
compile supportDependencies.annotation compile supportDependencies.annotation
compile supportDependencies.appCompat compile supportDependencies.cardView
compile supportDependencies.recycleview
compile supportDependencies.cardview
compile supportDependencies.designSupportLibrary compile supportDependencies.designSupportLibrary
compile supportDependencies.constrainLayout compile supportDependencies.constrainLayout
compile supportDependencies.kotlin compile supportDependencies.kotlin
compile extraDependencies.textDrawable compile extraDependencies.textDrawable
compile rxbindingDependencies.rxBinding compile rxbindingDependencies.rxBinding
compile rxbindingDependencies.rxBindingSupport compile rxbindingDependencies.rxBindingSupport
compile "com.android.support:support-v13:$rootProject.ext.supportLibraryVersion" compile "com.android.support:support-v13:$rootProject.ext.supportLibraryVersion"
testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
compile 'org.nibor.autolink:autolink:0.6.0' compile 'org.nibor.autolink:autolink:0.6.0'
compile 'com.github.yusukeiwaki.android-widget:widget-fontawesome:0.0.1' compile 'com.github.yusukeiwaki.android-widget:widget-fontawesome:0.0.1'
compile "com.facebook.fresco:fresco:$frescoVersion" compile "com.facebook.fresco:fresco:$frescoVersion"
compile "com.facebook.fresco:animated-gif:$frescoVersion"
compile "com.facebook.fresco:animated-webp:$frescoVersion"
compile "com.facebook.fresco:webpsupport:$frescoVersion"
compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion" compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"
compile 'com.caverock:androidsvg:1.2.1' compile 'com.caverock:androidsvg:1.2.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile "org.mockito:mockito-core:2.7.19" testCompile "org.mockito:mockito-core:2.7.19"
} }
...@@ -6,6 +6,7 @@ import android.graphics.Typeface ...@@ -6,6 +6,7 @@ import android.graphics.Typeface
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import chat.rocket.android.widget.AbsoluteUrl import chat.rocket.android.widget.AbsoluteUrl
import com.amulyakhare.textdrawable.TextDrawable import com.amulyakhare.textdrawable.TextDrawable
import java.net.URLEncoder import java.net.URLEncoder
/** /**
......
...@@ -4,7 +4,6 @@ plugins { ...@@ -4,7 +4,6 @@ plugins {
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'java' apply plugin: 'java'
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile extraDependencies.rxJava compile extraDependencies.rxJava
...@@ -23,6 +22,5 @@ dependencies { ...@@ -23,6 +22,5 @@ dependencies {
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile "org.mockito:mockito-inline:2.8.9" testCompile "org.mockito:mockito-inline:2.8.9"
} }
sourceCompatibility = "1.7" sourceCompatibility = "1.7"
targetCompatibility = "1.7" targetCompatibility = "1.7"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment