CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done.

CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments
CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application
2026-01-30 00:05:28 +08:00 · 2014-09-04 10:53:41 -07:00 · 2014-09-04 10:53:29 -07:00 · 2014-09-03 15:26:16 -07:00 · 2014-08-29 16:34:11 -07:00
8 changed files with 89 additions and 32 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-3.6.0-dev
+3.6.0
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
 */

 // Coho updates this line:
-var VERSION = "3.6.0-dev";
+var VERSION = "3.6.0";

 console.log(VERSION);
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -1,3 +1,24 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+
+
 buildscript {
    repositories {
        mavenCentral()
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -248,10 +248,8 @@ public class CordovaActivity extends Activity implements CordovaInterface {
        root.addView((View) appView);
        setContentView(root);

-        // TODO: Setting this on the appView causes it to show when <html style="opacity:0">.
        int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
        root.setBackgroundColor(backgroundColor);
-        appView.setBackgroundColor(backgroundColor);
    }

    /**
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -61,7 +61,7 @@ import android.widget.FrameLayout;
 public class CordovaWebView extends WebView {

    public static final String TAG = "CordovaWebView";
-    public static final String CORDOVA_VERSION = "3.6.0-dev";
+    public static final String CORDOVA_VERSION = "3.6.0";

    private HashSet<Integer> boundKeyCodes = new HashSet<Integer>();

--- a/package.json
+++ b/package.json
@@ -1,28 +1,28 @@
 {
-  "name": "cordova-android",
-  "version": "3.4.0",
-  "description": "cordova-android release",
-  "main": "bin/create",
-  "repository": {
-    "type": "git",
-    "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
-  },
-  "keywords": [
-    "android",
-    "cordova",
-    "apache"
-  ],
-  "scripts": {
-    "test": "jasmine-node --color spec"
-  },
-  "author": "Apache Software Foundation",
-  "license": "Apache version 2.0",
-  "dependencies": {
-    "q": "^0.9.0",
-    "shelljs": "^0.2.6"
-  },
-  "devDependencies": {
-    "jasmine-node": "~1",
-    "promise-matchers": "~0"
-  }
-}
+    "name": "cordova-android",
+    "version": "3.6.0",
+    "description": "cordova-android release",
+    "main": "bin/create",
+    "repository": {
+        "type": "git",
+        "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
+    },
+    "keywords": [
+        "android",
+        "cordova",
+        "apache"
+    ],
+    "scripts": {
+        "test": "jasmine-node --color spec"
+    },
+    "author": "Apache Software Foundation",
+    "license": "Apache version 2.0",
+    "dependencies": {
+        "q": "^0.9.0",
+        "shelljs": "^0.2.6"
+    },
+    "devDependencies": {
+        "jasmine-node": "~1",
+        "promise-matchers": "~0"
+    }
+}
--- a/test/src/org/apache/cordova/test/SabotagedActivity.java
+++ b/test/src/org/apache/cordova/test/SabotagedActivity.java
@@ -1,3 +1,22 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
 package org.apache.cordova.test;

 import java.io.IOException;
--- a/test/src/org/apache/cordova/test/junit/IntentUriOverrideTest.java
+++ b/test/src/org/apache/cordova/test/junit/IntentUriOverrideTest.java
@@ -1,3 +1,22 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
 package org.apache.cordova.test.junit;

 import org.apache.cordova.CordovaWebView;
Author	SHA1	Message	Date
Joe Bowser	7dbc5b0965	CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done.	2014-09-04 10:53:41 -07:00
Joe Bowser	60578f3f0d	CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments	2014-09-04 10:53:29 -07:00
Joe Bowser	afdd16a214	CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application	2014-09-03 15:26:16 -07:00
Steven Gill	014327c59a	Set VERSION to 3.6.0 (via coho)	2014-08-29 16:34:11 -07:00