From cb44ebaf03f6de036e1b23ad271c5da0e66fa48a Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Tue, 29 Mar 2016 10:26:38 +0800
Subject: [PATCH] Update dependencies

sbt-idea is outdated. Use Android Studio or IntelliJ's import SBT project instead.
---
 project/plugins.sbt          | 6 +-----
 src/main/AndroidManifest.xml | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5bd5e4e2..1e6cd68a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,10 +1,6 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.19")
-
-resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
-
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.7.0-SNAPSHOT")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.20")
 
 resolvers += Resolver.url("rtimush/sbt-plugin-snapshots", new URL("https://dl.bintray.com/rtimush/sbt-plugin-snapshots/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 73e0bfdb..06a50ffd 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.github.shadowsocks"
+          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
           android:versionCode="134"
           android:versionName="2.10.1">
 
@@ -92,7 +92,7 @@
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
                   android:taskAffinity=""
-            android:theme="@style/PopupTheme.QuickSwitch">
+                  android:theme="@style/PopupTheme.QuickSwitch">
             <intent-filter>
                 <action android:name="com.github.shadowsocks.QUICK_SWITCH" />
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -128,7 +128,7 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".TaskerReceiver">
+        <receiver android:name=".TaskerReceiver" tools:ignore="ExportedReceiver">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
             </intent-filter>