From 8a95ed8ee669d191157636e6259d0d6272c5d5ed Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Tue, 7 May 2013 10:27:01 -0400 Subject: [PATCH] [CB-3307] Rename cordova-VERSION.js -> cordova.js --- bin/templates/project/assets/www/index.html | 2 +- .../{js/cordova.android.js => www/cordova.js} | 0 framework/assets/www/index.html | 2 +- framework/build.xml | 35 +++---------------- framework/src/org/apache/cordova/Device.java | 2 +- 5 files changed, 7 insertions(+), 34 deletions(-) rename framework/assets/{js/cordova.android.js => www/cordova.js} (100%) diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html index 4d39cf38..e84fbd7c 100644 --- a/bin/templates/project/assets/www/index.html +++ b/bin/templates/project/assets/www/index.html @@ -33,7 +33,7 @@

Device is Ready

- + + diff --git a/framework/build.xml b/framework/build.xml index 9e7b1278..989dbb2f 100644 --- a/framework/build.xml +++ b/framework/build.xml @@ -26,8 +26,7 @@ - + @@ -80,9 +79,6 @@ --> - - " - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -195,10 +168,10 @@ - + - + diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java index aa316c5f..d9d99282 100644 --- a/framework/src/org/apache/cordova/Device.java +++ b/framework/src/org/apache/cordova/Device.java @@ -38,7 +38,7 @@ import android.telephony.TelephonyManager; public class Device extends CordovaPlugin { public static final String TAG = "Device"; - public static String cordovaVersion = "2.6.0"; // Cordova version + public static String cordovaVersion = "dev"; // Cordova version public static String platform = "Android"; // Device OS public static String uuid; // Device UUID