Up sdk and gradle versions

markwinter · Nov 2, 2014 · f2267a1 · f2267a1
1 parent 57af914
commit f2267a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:0.13.3"
+        classpath "com.android.tools.build:gradle:0.14.0"
         classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.0"
     }
 }
@@ -40,21 +40,24 @@ android {
         absolutePaths false
         lintConfig file("lint.xml")
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
     compile files('libs/jToxcore.jar')
     compile files('libs/core.jar')
     compile files('libs/dnsjava-2.1.6.jar')
     compile files('libs/kalium-jni-1.0.0-SNAPSHOT.jar')
-    compile "org.scala-lang:scala-library:2.11.2"
-    compile 'com.android.support:support-v4:21.0.0'
-    compile "org.scaloid:scaloid_2.11:3.5-10"
-    compile 'com.android.support:appcompat-v7:21.0.0'
+    compile 'org.scala-lang:scala-library:2.11.2'
+    compile 'com.android.support:support-v4:21.0.1'
+    compile 'org.scaloid:scaloid_2.11:3.5-10'
+    compile 'com.android.support:appcompat-v7:21.0.1'
     compile 'com.netflix.rxjava:rxjava-core:0.20.4'
     compile 'com.netflix.rxjava:rxjava-android:0.20.4'
     compile 'com.netflix.rxjava:rxjava-scala:0.20.4'
     compile 'com.github.machinarius:preferencefragment:0.1.1'
     compile 'com.shamanland:fab:0.0.5'
-
 }
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
@@ -8,6 +8,7 @@ public protected *;
 -dontoptimize
 -dontpreverify
 -dontwarn **
+-ignorewarnings
 -dontnote javax.xml.**
 -dontnote org.w3c.dom.**
 -dontnote org.xml.sax.**

diff --git a/app/src/main/scala/im/tox/antox/fragments/LeftPaneFragment.scala b/app/src/main/scala/im/tox/antox/fragments/LeftPaneFragment.scala
@@ -2,17 +2,12 @@ package im.tox.antox.fragments
 
 import android.app.ActionBar
 import android.app.FragmentTransaction
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
 import android.support.v4.view.ViewPager
 import android.support.v4.view.PagerTabStrip
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.style.ImageSpan
-import android.text.style.DynamicDrawableSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup