resolve all dependencies with gradle/maven

4 files changed, 28 insertions, 21 deletions

diff --git a/app/app.iml b/app/app.iml
index 2df7a68a..ee507c06 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SmileEssence" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="SmileEssence" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -12,8 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -80,24 +81,22 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
-    <orderEntry type="library" exported="" name="twitter4j-media-support-4.0.3" level="project" />
-    <orderEntry type="library" exported="" name="library-3.2.0" level="project" />
-    <orderEntry type="library" exported="" name="twitter-text-1.6.1" level="project" />
+    <orderEntry type="library" exported="" name="guava-18.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.15" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
+    <orderEntry type="library" exported="" name="activeandroid-3.1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-stream-4.0.3" level="project" />
-    <orderEntry type="library" exported="" name="ActiveAndroid-3.1" level="project" />
-    <orderEntry type="library" exported="" name="twitter4j-core-4.0.3" level="project" />
+    <orderEntry type="library" exported="" name="library-3.2.3" level="project" />
+    <orderEntry type="library" exported="" name="twitter4j-media-support-4.0.3" level="project" />
     <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" />
     <orderEntry type="library" exported="" name="snakeyaml-1.12" level="project" />
-    <orderEntry type="library" exported="" name="support-v13-18.0.0" level="project" />
-    <orderEntry type="library" exported="" name="guava-18.0" level="project" />
-    <orderEntry type="library" exported="" name="modules/volley-unspecified" level="project" />
+    <orderEntry type="library" exported="" name="support-v13-22.1.1" level="project" />
+    <orderEntry type="library" exported="" name="twitter-text-1.6.1" level="project" />
+    <orderEntry type="library" exported="" name="twitter4j-core-4.0.3" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 733ec641..97dcb419 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,25 +21,33 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
     }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+repositories {
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:support-v13:22.1.1'
     //    compile 'com.android.support:appcompat-v7:22.1.0'
-    compile 'com.android.support:support-v13:18.0.0'
     // volley
-    compile project(':modules/volley')
+    compile 'com.mcxiaoke.volley:library:1.0.+@aar'
+    // ActiveAndroid
+    compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
     // 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
-    compile 'com.navercorp.pulltorefresh:library:3.2.0@aar'
+    compile 'com.navercorp.pulltorefresh:library:3.2.3@aar'
     // t4j
     compile 'org.twitter4j:twitter4j-core:4.0.3'
     compile 'org.twitter4j:twitter4j-media-support:4.0.3'
diff --git a/app/libs/ActiveAndroid-3.1.jar b/app/libs/ActiveAndroid-3.1.jar
deleted file mode 100644
index 32adcaeb..00000000
--- a/app/libs/ActiveAndroid-3.1.jar
+++ /dev/null
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index eb902516..45dc58a5 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/laco/Library/Android/sdk/tools/proguard/proguard-android.txt
+# in /opt/android-sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #