cordova-sqlite-evcore-common-free 0.0.1 - merge

Merge branch 'storage-master' of https://github.com/litehelpers/Cordova-sqlite-storage into cordova-sqlite-evcore-common-free

(with some test & doc updates)

CHANGES.md

@@ -1,6 +1,46 @@
 # Changes
 
-### cordova-sqlite-evcore-legacy-ext-common-free 0.0.6
+### cordova-sqlite-evcore-common-free 0.0.1
+
+#### cordova-sqlite-storage 2.3.3
+
+- Quick fix for some iOS/macOS internal plugin error log messagess
+- test updates
+- quick doc updates
+
+#### cordova-sqlite-storage 2.3.2
+
+- Mark some Android errors as internal plugin errors (quick fix)
+- remove trailing whitespace from Android implementation
+- test coverage updates
+- quick doc updates
+
+#### cordova-sqlite-storage 2.3.1
+
+- Mark some iOS/macOS plugin error messages as internal plugin errors (quick fix)
+- Quick documentation updates
+
+#### cordova-sqlite-storage 2.2.1
+
+- Fix Android/iOS src copyright, perpetually
+
+#### cordova-sqlite-storage 2.2.0
+
+- Fix SQLiteAndroidDatabase implementation for Turkish and other foreign locales
+
+#### cordova-sqlite-storage 2.1.0
+
+- Visual Studio 2017 updates for Windows UWP build
+
+#### cordova-sqlite-storage 2.0.2
+
+- Fix Windows target platform version
+
+#### cordova-sqlite-storage 2.0.0
+
+- Reference Windows platform toolset v141 to support Visual Studio 2017 (RC)
+
+#### cordova-sqlite-evcore-legacy-ext-common-free 0.0.6
 
 - Use cordova-sqlite-evcore-free-dependencies 0.8.2 with fix for multi-byte UTF-8 characters on Android ref:
   - litehelpers/Cordova-sqlite-evcore-extbuild-free#19 (<https://github.com/litehelpers/Cordova-sqlite-evcore-extbuild-free/issues/19>)
@@ -33,7 +73,7 @@
 
 - Support Windows 8.1/Windows Phone 8.1 in this plugin version branch
 
-## cordova-sqlite-evcore-common-free 0.7.6
+### cordova-sqlite-evcore-common-free 0.7.6
 
 - cordova-sqlite-evcore-common-free compile-time option fixes (for iOS/macOS):
   - Suppress warnings when building sqlite3.c (iOS/macOS)

CONTRIBUTING.md

@@ -1,11 +1,23 @@
-## Bugs and other issues
+# General
+
+**IMPORTANT:** Please raise general questions in [litehelpers / Cordova-sqlite-help / issues](https://github.com/litehelpers/Cordova-sqlite-help/issues).
+
+## Reproducible bugs
 
 - Verify the results of calling the echoTest and selfTest functions as described in README.md
 - Check the pitfalls and other troubleshooting steps in README.md and [brodybits / Avoiding-some-Cordova-pitfalls](https://github.com/brodybits/Avoiding-some-Cordova-pitfalls)
-- Reproduce the issue in a fresh, clean project, ideally based on [brodybits / Cordova-sqlite-bootstrap-test](https://github.com/brodybits/Cordova-sqlite-bootstrap-test)
+- Reproduce the issue in a fresh, clean project, preferably based on [brodybits / Cordova-sqlite-bootstrap-test](https://github.com/brodybits/Cordova-sqlite-bootstrap-test) or [brodybits / cordova-sqlite-test-app](https://github.com/brodybits/cordova-sqlite-test-app).
 
 Please see README.md for more details.
 
+## Feature requests
+
+Feature requests are welcome for community discussion and future consideration. Preference will be given to paid customers. Please contact <sales@litehelpers.net> for more information.
+
+## Other questions
+
+**NOTE:** As stated above please other questions in [litehelpers / Cordova-sqlite-help / issues](https://github.com/litehelpers/Cordova-sqlite-help/issues).
+
 ## Contributing patches
 
 Patches will NOT be accepted on this version due to possible licensing issues.

HISTORY.md

@@ -134,6 +134,10 @@ New versions introduced
   available under GPL or commercial licensing options with support for PhoneGap Build
 - Cordova-sqlite-evplus (legacy) versions with GPL or premium commercial licensing options
 
+## Major changes 2017
+
+Windows platform toolset dependency updated for Visual Studio 2017
+
 ## Recent changes
 
 See CHANGES.md

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "cordova-sqlite-evcore-legacy-ext-common-free",
-  "version": "0.0.6",
-  "description": "Cordova/PhoneGap sqlite storage - free enterprise version with performance improvements for Android (legacy common version branch with external sqlite3 dependencies)",
+  "name": "cordova-sqlite-evcore-common-free",
+  "version": "0.0.1",
+  "description": "Cordova/PhoneGap sqlite storage - free enterprise version with performance improvements for Android (common version branch with external sqlite3 dependencies)",
   "cordova": {
-    "id": "cordova-sqlite-evcore-legacy-ext-common-free",
+    "id": "cordova-sqlite-evcore-common-free",
     "platforms": [
       "android",
       "ios",

plugin.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    id="cordova-sqlite-evcore-legacy-ext-common-free"
-    version="0.0.6">
+    id="cordova-sqlite-evcore-common-free"
+    version="0.0.1">
 
-    <name>Cordova sqlite storage - free enterprise version with performance improvements for Android (legacy common version branch with external sqlite3 dependencies)</name>
+    <name>Cordova sqlite storage - free enterprise version with performance improvements for Android (common version branch with external sqlite3 dependencies)</name>
 
-    <license>GPL</license>
+    <license>GPL-3.0 OR Commercial</license>
 
     <keywords>sqlite</keywords>
 
@@ -79,7 +79,7 @@
             </feature>
         </config-file>
 
-        <!-- Note: the macOS src is based off src/ios implicitly -->
+        <!-- Note: the macOS (osx) src is based off src/ios implicitly -->
         <header-file src="src/ios/SQLitePlugin.h" />
         <source-file src="src/ios/SQLitePlugin.m" />
 
@@ -116,10 +116,10 @@
 
         <!-- Thanks to AllJoyn-Cordova / cordova-plugin-alljoyn for guidance: -->
         <framework src="src/windows/SQLite3-Win-RT/SQLite3/SQLite3.UWP/SQLite3.UWP.vcxproj" custom="true" type="projectReference" versions="10.*" />
-        <!-- Windows 8.1 / Windows Phone 8.1 supported by this plugin version branch: -->
+        <!-- Windows 8.1 / Windows Phone 8.1 NOT supported by this plugin version:
         <framework src="src/windows/SQLite3-Win-RT/SQLite3/SQLite3.Windows/SQLite3.Windows.vcxproj" custom="true" type="projectReference" target="windows" versions="8.1" />
         <framework src="src/windows/SQLite3-Win-RT/SQLite3/SQLite3.WindowsPhone/SQLite3.WindowsPhone.vcxproj" custom="true" type="projectReference" target="phone" versions="8.1" />
-        <!-- ... -->
+        - -->
     </platform>
 
 </plugin>

scripts/beforePluginInstall.js

@@ -7,7 +7,7 @@ var path = require('path');
 var exec = require('child_process').exec;
 
 // XXX FUTURE TBD auto-detect:
-var package_name = 'cordova-sqlite-evcore-legacy-ext-common-free';
+var package_name = 'cordova-sqlite-evcore-common-free';
 
 module.exports = function (context) {
     var Q = context.requireCordovaModule('q');

spec/www/index.html

@@ -6,12 +6,12 @@
 
   <title>SQLitePlugin Jasmine Spec Runner</title>
 
-  <link rel="shortcut icon" type="image/png" href="lib/jasmine-2.4.1/jasmine_favicon.png">
-  <link rel="stylesheet" href="lib/jasmine-2.4.1/jasmine.css">
+  <link rel="shortcut icon" type="image/png" href="lib/jasmine-2.5.2/jasmine_favicon.png">
+  <link rel="stylesheet" href="lib/jasmine-2.5.2/jasmine.css">
 
-  <script src="lib/jasmine-2.4.1/jasmine.js"></script>
-  <script src="lib/jasmine-2.4.1/jasmine-html.js"></script>
-  <script src="lib/jasmine-2.4.1/boot.js"></script>
+  <script src="lib/jasmine-2.5.2/jasmine.js"></script>
+  <script src="lib/jasmine-2.5.2/jasmine-html.js"></script>
+  <script src="lib/jasmine-2.5.2/boot.js"></script>
 
   <!-- [Cordova] source file(s): -->
   <script src="cordova.js"></script>

spec/www/lib/jasmine-2.4.1/console.js → spec/www/lib/jasmine-2.5.2/console.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2015 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

spec/www/lib/jasmine-2.4.1/jasmine-html.js → spec/www/lib/jasmine-2.5.2/jasmine-html.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2015 Pivotal Labs
+Copyright (c) 2008-2016 Pivotal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -209,9 +209,10 @@ jasmineRequire.HtmlReporter = function(j$) {
 
       if (specsExecuted < totalSpecsDefined) {
         var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
+        var skippedLink = order && order.random ? '?random=true' : '?';
         alert.appendChild(
           createDom('span', {className: 'jasmine-bar jasmine-skipped'},
-            createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage)
+            createDom('a', {href: skippedLink, title: 'Run all specs'}, skippedMessage)
           )
         );
       }
@@ -237,15 +238,22 @@ jasmineRequire.HtmlReporter = function(j$) {
 
       alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage, seedBar));
 
-      for(i = 0; i < failedSuites.length; i++) {
+      var errorBarClassName = 'jasmine-bar jasmine-errored';
+      var errorBarMessagePrefix = 'AfterAll ';
+
+      for(var i = 0; i < failedSuites.length; i++) {
         var failedSuite = failedSuites[i];
         for(var j = 0; j < failedSuite.failedExpectations.length; j++) {
-          var errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message;
-          var errorBarClassName = 'jasmine-bar jasmine-errored';
-          alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessage));
+          alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failedSuite.failedExpectations[j].message));
         }
       }
 
+      var globalFailures = (doneResult && doneResult.failedExpectations) || [];
+      for(i = 0; i < globalFailures.length; i++) {
+        var failure = globalFailures[i];
+        alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessagePrefix + failure.message));
+      }
+
       var results = find('.jasmine-results');
       results.appendChild(summary);
 
@@ -309,7 +317,7 @@ jasmineRequire.HtmlReporter = function(j$) {
         setMenuModeTo('jasmine-failure-list');
 
         var failureNode = find('.jasmine-failures');
-        for (var i = 0; i < failures.length; i++) {
+        for (i = 0; i < failures.length; i++) {
           failureNode.appendChild(failures[i]);
         }
       }