diff --git a/.idea/.name b/.idea/.name
index ac795d7..f71e8e3 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Emoji Switcher
\ No newline at end of file
+EmojiSwitcher
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..9a8b7e5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -19,5 +19,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/dictionaries/Steven.xml b/.idea/dictionaries/Steven.xml
deleted file mode 100644
index 74148a1..0000000
--- a/.idea/dictionaries/Steven.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- emoji
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e206d70..97626ba 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,5 +1,6 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b62fe97..0b630ff 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
+
-
-
+
\ No newline at end of file
diff --git a/.idea/libraries/RootTools_3_5.xml b/.idea/libraries/RootTools_4_2.xml
similarity index 78%
rename from .idea/libraries/RootTools_3_5.xml
rename to .idea/libraries/RootTools_4_2.xml
index da2380a..659e5b1 100644
--- a/.idea/libraries/RootTools_3_5.xml
+++ b/.idea/libraries/RootTools_4_2.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml
new file mode 100644
index 0000000..a6ca07e
--- /dev/null
+++ b/.idea/libraries/appcompat_v7_22_2_0.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_6_1_11.xml b/.idea/libraries/play_services_ads_7_5_0.xml
similarity index 53%
rename from .idea/libraries/play_services_6_1_11.xml
rename to .idea/libraries/play_services_ads_7_5_0.xml
index c7fb429..b483079 100644
--- a/.idea/libraries/play_services_6_1_11.xml
+++ b/.idea/libraries/play_services_ads_7_5_0.xml
@@ -1,8 +1,8 @@
-
+
-
-
+
+
diff --git a/.idea/libraries/play_services_analytics_7_5_0.xml b/.idea/libraries/play_services_analytics_7_5_0.xml
new file mode 100644
index 0000000..1157d2a
--- /dev/null
+++ b/.idea/libraries/play_services_analytics_7_5_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/play_services_base_7_5_0.xml b/.idea/libraries/play_services_base_7_5_0.xml
new file mode 100644
index 0000000..754808a
--- /dev/null
+++ b/.idea/libraries/play_services_base_7_5_0.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_20_0_0.xml b/.idea/libraries/support_annotations_20_0_0.xml
deleted file mode 100644
index ceb0f0c..0000000
--- a/.idea/libraries/support_annotations_20_0_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml
new file mode 100644
index 0000000..fe973be
--- /dev/null
+++ b/.idea/libraries/support_annotations_22_2_0.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_20_0_0.xml b/.idea/libraries/support_v4_20_0_0.xml
deleted file mode 100644
index 420d544..0000000
--- a/.idea/libraries/support_v4_20_0_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml
new file mode 100644
index 0000000..f0443e6
--- /dev/null
+++ b/.idea/libraries/support_v4_22_2_0.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index feeb5e4..95f0f03 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 85f1709..024d759 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,5 +6,4 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index def6a6a..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/Emoji Switcher/Emoji Switcher.iml b/Emoji Switcher/Emoji Switcher.iml
index ff82e59..4e94901 100644
--- a/Emoji Switcher/Emoji Switcher.iml
+++ b/Emoji Switcher/Emoji Switcher.iml
@@ -1,5 +1,5 @@
-
+
@@ -9,11 +9,15 @@
+
-
-
-
+
+
+
+ generateDebugAndroidTestSources
+ generateDebugSources
+
@@ -22,8 +26,9 @@
-
+
+
@@ -31,11 +36,13 @@
-
-
-
-
-
+
+
+
+
+
+
+
@@ -64,6 +71,11 @@
+
+
+
+
+
@@ -79,14 +91,16 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/Emoji Switcher/build.gradle b/Emoji Switcher/build.gradle
index 6d2b8db..85970f6 100644
--- a/Emoji Switcher/build.gradle
+++ b/Emoji Switcher/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 21
- buildToolsVersion '21.0.2'
+ compileSdkVersion 22
+ buildToolsVersion '22.0.1'
defaultConfig {
minSdkVersion 19
- targetSdkVersion 21
+ targetSdkVersion 22
versionCode 9
versionName "1.6.1"
}
@@ -18,8 +18,9 @@ android {
}
dependencies {
- compile 'com.google.android.gms:play-services:6.1.+'
+ compile 'com.google.android.gms:play-services-ads:7.5.0'
compile 'commons-io:commons-io:2.4'
- compile 'com.google.guava:guava:18.+'
- compile files('libs/RootTools-3.5.jar')
+ compile 'com.google.guava:guava:18.0'
+ compile files('libs/RootTools-4.2.jar')
+ compile 'com.android.support:appcompat-v7:22.2.0'
}
\ No newline at end of file
diff --git a/Emoji Switcher/libs/RootTools-3.5.jar b/Emoji Switcher/libs/RootTools-3.5.jar
deleted file mode 100644
index 245ec77..0000000
Binary files a/Emoji Switcher/libs/RootTools-3.5.jar and /dev/null differ
diff --git a/Emoji Switcher/libs/RootTools-4.2.jar b/Emoji Switcher/libs/RootTools-4.2.jar
new file mode 100644
index 0000000..794fcde
Binary files /dev/null and b/Emoji Switcher/libs/RootTools-4.2.jar differ
diff --git a/EmojiSwitcher.iml b/EmojiSwitcher.iml
index 0bb6048..0e63261 100644
--- a/EmojiSwitcher.iml
+++ b/EmojiSwitcher.iml
@@ -1,13 +1,14 @@
-
+
+
-
+
@@ -15,5 +16,4 @@
-
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a26d4e5..cb7baa9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,15 +2,15 @@
buildscript {
repositories {
- mavenCentral()
+ jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.13.2'
+ classpath 'com.android.tools.build:gradle:1.2.3'
}
}
allprojects {
repositories {
- mavenCentral()
+ jcenter()
}
}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dcd590b..dab2163 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 17 15:56:18 EDT 2014
+#Sun Apr 12 23:25:35 EDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip