Merge branch 'release/3.2' into develop

wordpress-mobile · Sep 3, 2014 · 083a272 · 083a272
2 parents 69b59e1 + 0be4ddf
commit 083a272
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -37,8 +37,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "3.1"
-        versionCode 132
+        versionName "3.2-beta-1"
+        versionCode 133
         minSdkVersion 14
         targetSdkVersion 19
 
@@ -99,17 +99,10 @@ dependencies {
     // Simperium
     compile('com.simperium.android:simperium:0.5.0')
 
-    debugCompile project(path:':libs:utils:WordPressUtils')
-    releaseCompile 'org.wordpress:wordpress-utils:1.2.0'
-
-    debugCompile project(path:':libs:networking:WordPressNetworking')
-    releaseCompile 'org.wordpress:wordpress-networking:1.0.0'
-
-    debugCompile project(path:':libs:wpcomrest:WordPressComRest')
-    releaseCompile 'com.automattic:wordpresscom-rest:1.0.0'
-
-    debugCompile project(path:':libs:graphview:WordPressGraphView')
-    releaseCompile 'org.wordpress:graphview:3.2.2'
+    compile project(path:':libs:utils:WordPressUtils')
+    compile project(path:':libs:networking:WordPressNetworking')
+    compile project(path:':libs:wpcomrest:WordPressComRest')
+    compile project(path:':libs:graphview:WordPressGraphView')
 }
 
 

diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java
@@ -1,14 +1,17 @@
 package org.wordpress.android.util;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 
 /**
  * requires android.permission.ACCESS_NETWORK_STATE
  */
+
 public class NetworkUtils {
     public static final int TYPE_UNKNOWN = -1;
 
@@ -57,6 +60,8 @@ public static boolean isWiFiConnected(Context context) {
     /**
      * returns true if airplane mode has been enabled
      */
+    @TargetApi(VERSION_CODES.JELLY_BEAN_MR1)
+    @SuppressWarnings("deprecation")
     public static boolean isAirplaneModeOn(Context context) {
         // prior to JellyBean 4.2 this was Settings.System.AIRPLANE_MODE_ON, JellyBean 4.2
         // moved it to Settings.Global