diff options
| author | Dan Roundhill <dan@automattic.com> | 2014-05-12 08:24:07 -0700 |
|---|---|---|
| committer | Dan Roundhill <dan@automattic.com> | 2014-05-12 08:24:07 -0700 |
| commit | 952f80f89d87fbae3a0574dae0dfdf25f8a61487 (patch) | |
| tree | c050fad1582e0575a86574721a6b65207c8d4376 /build.gradle | |
| parent | 4ed08da654b327f902cd32d7a48c84a5b1508a2c (diff) | |
| parent | aa0977bf94961c55f907077f5eae004819f36647 (diff) | |
| download | gradle-perf-android-medium-952f80f89d87fbae3a0574dae0dfdf25f8a61487.tar.gz | |
Merge branch 'develop' into feature/simperium
Conflicts:
res/values-v11/styles.xml
res/values-v14/styles.xml
res/values/styles.xml
src/org/wordpress/android/GCMIntentService.java
src/org/wordpress/android/WordPressDB.java
src/org/wordpress/android/ui/notifications/NotificationUtils.java
src/org/wordpress/android/ui/notifications/NotificationsActivity.java
src/org/wordpress/android/ui/notifications/NotificationsListFragment.java
src/org/wordpress/android/util/AuthErrorDialogFragment.java
src/org/wordpress/android/util/ToastUtils.java
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index 72d5970a7..a514045cd 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ android { packageName "org.wordpress.android" versionName "2.8.1" versionCode 110 - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion 19 } @@ -67,7 +67,7 @@ android { // Provided by maven central compile 'com.google.code.gson:gson:2.2.2' compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' - compile 'com.android.support:support-v4:19.0.+' + compile 'com.android.support:support-v13:19.0.+' compile 'com.github.castorflex.smoothprogressbar:library:0.4.0' androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.+' @@ -76,7 +76,6 @@ android { androidTestCompile 'org.mockito:mockito-core:+' // These are provided by the WordPress-Android Repository - compile 'org.wordpress:actionbarsherlock:4.4.0' compile 'org.wordpress:menudrawer:3.0.5-SNAPSHOT' compile 'org.wordpress:gcm:1.0.0' compile 'com.automattic:wordpresscom-rest:0.0.5' @@ -87,7 +86,6 @@ android { compile 'org.wordpress:android-passcodelock:0.0.5' compile 'org.wordpress:commons-lang:2.6' compile 'org.wordpress:pulltorefresh-main:+' - compile 'org.wordpress:pulltorefresh-abs:+' releaseCompile 'org.wordpress:emailchecker:0.2' debugCompile 'org.wordpress:emailchecker-debug:0.2' zbetagroupCompile 'org.wordpress:emailchecker:0.2' |