cleanupoldmaster

1 files changed, 12 insertions, 30 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 098c122f..d000b467 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'io.fabric'
 
 buildscript {
@@ -35,34 +34,16 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        release2.initWith(buildTypes.release)
-        release2 {
-            applicationIdSuffix ".release2"
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/services/javax.annotation.processing.Processor'
     }
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
-    dexOptions {
-        preDexLibraries = false
-    }
 }
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
-    //compile 'com.android.support:support-v4:26.1.0'
     compile 'com.android.support:support-core-ui:26.1.0'
     compile 'com.android.support:support-v13:26.1.0'
 
@@ -70,34 +51,35 @@ dependencies {
     compile "org.jetbrains.anko:anko-commons:$anko_version"
     compile "org.jetbrains.anko:anko-coroutines:$anko_version"
 
-    // volley
-    compile 'com.android.volley:volley:1.0.0'
-    // crouton
+    // Volley
+    compile 'com.android.volley:volley:1.0.0@aar'
+
+    // Crouton
     compile('de.keyboardsurfer.android.widget:crouton:1.8.5@aar') {
         // exclusion is not necessary, but generally a good idea.
         exclude group: 'com.google.android', module: 'support-v4'
     }
-    // pull to refresh
+
+    // PullToRefresh
     compile 'com.navercorp.pulltorefresh:library:3.3.0-SNAPSHOT@aar'
+
     // twitter4j
     compile 'org.twitter4j:twitter4j-core:4.0.6'
     compile 'org.twitter4j:twitter4j-media-support:4.0.6'
     compile 'org.twitter4j:twitter4j-stream:4.0.6'
-    // twitter-text
-    compile 'com.twitter:twitter-text:1.14.7'
 
+    // Orma
     kapt "com.github.gfx.android.orma:orma-processor:4.2.5"
-    compile "com.github.gfx.android.orma:orma:4.2.5"
+    compile 'com.github.gfx.android.orma:orma:4.2.5'
 
     // Fabric
     compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true;
+        transitive = true
     }
 
     // LeakCanary
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-    release2Compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4@aar'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4@aar'
 }
 
 kotlin {