You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2015/09/23 21:58:36 UTC
[25/45] android commit: Make Cordova pass the Lint step
Make Cordova pass the Lint step
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/771f5ecc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/771f5ecc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/771f5ecc
Branch: refs/heads/5.0.x
Commit: 771f5ecc22488d69a2deefbe2cbd47e7eb632626
Parents: ea5ddcc
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Aug 10 16:43:41 2015 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Aug 20 14:22:41 2015 -0700
----------------------------------------------------------------------
framework/build.gradle | 19 +++----------------
.../src/org/apache/cordova/CordovaActivity.java | 2 ++
.../cordova/engine/SystemCookieManager.java | 3 +++
.../cordova/engine/SystemWebViewEngine.java | 2 +-
4 files changed, 9 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/771f5ecc/framework/build.gradle
----------------------------------------------------------------------
diff --git a/framework/build.gradle b/framework/build.gradle
index 4d6f36c..a598faa 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -20,23 +20,10 @@ buildscript {
mavenCentral()
}
- // Switch the Android Gradle plugin version requirement depending on the
- // installed version of Gradle. This dependency is documented at
- // http://tools.android.com/tech-docs/new-build-system/version-compatibility
- // and https://issues.apache.org/jira/browse/CB-8143
- if (gradle.gradleVersion >= "2.2") {
- dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0+'
- }
- } else if (gradle.gradleVersion >= "2.1") {
- dependencies {
- classpath 'com.android.tools.build:gradle:0.14.0+'
- }
- } else {
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.0+'
- }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.0.0+'
}
+
}
apply plugin: 'android-library'
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/771f5ecc/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index e446927..171e2a8 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -26,6 +26,7 @@ import org.json.JSONObject;
import android.app.Activity;
import android.app.AlertDialog;
+import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
@@ -323,6 +324,7 @@ public class CordovaActivity extends Activity {
}
}
+ @SuppressLint("NewApi")
@Override
public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
// Capture requestCode here so that it is captured in the setActivityResultCallback() case.
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/771f5ecc/framework/src/org/apache/cordova/engine/SystemCookieManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/engine/SystemCookieManager.java b/framework/src/org/apache/cordova/engine/SystemCookieManager.java
index ae55dfe..b88909e 100644
--- a/framework/src/org/apache/cordova/engine/SystemCookieManager.java
+++ b/framework/src/org/apache/cordova/engine/SystemCookieManager.java
@@ -19,6 +19,7 @@
package org.apache.cordova.engine;
+import android.annotation.TargetApi;
import android.os.Build;
import android.webkit.CookieManager;
import android.webkit.WebView;
@@ -30,6 +31,8 @@ class SystemCookieManager implements ICordovaCookieManager {
protected final WebView webView;
private final CookieManager cookieManager;
+ //Added because lint can't see the conditional RIGHT ABOVE this
+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
public SystemCookieManager(WebView webview) {
webView = webview;
cookieManager = CookieManager.getInstance();
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/771f5ecc/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
index 221a884..5e6e4b6 100755
--- a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
@@ -135,7 +135,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
return webView;
}
- @SuppressLint("SetJavaScriptEnabled")
+ @SuppressLint({"NewApi", "SetJavaScriptEnabled"})
@SuppressWarnings("deprecation")
private void initWebViewSettings() {
webView.setInitialScale(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org