Merge pull request #12 from volodymyrtaliar/sqlite-storage

Updates to SQLite Storage plugin v1.1.0

README.md

@@ -9,13 +9,13 @@ For more details please refer to the [com.good.gd.database](https://developer.bl
 ## Preconditions
 `cordova-plugin-bbd-sqlite-storage` is dependent on `cordova-plugin-bbd-base` and `cordova-plugin-bbd-file` plugins.
 
-Installation
-============
-To add this plugin to your application, run the following command in the project directory:
-```
-$ cd <path/to/package>/BlackBerry_Dynamics_SDK_for_Cordova_<version>/plugins/cordovaApp
-$ cordova plugin add git+https://github.com/blackberry/BlackBerry-Dynamics-Cordova-Plugins#sqlite-storage
-```
+## Installation
+
+`cordova plugin add git+https://github.com/blackberry/blackberry-dynamics-cordova-plugins#sqlite-storage`
+
+## Uninstallation
+
+`cordova plugin rm cordova-plugin-bbd-sqlite-storage`
 
 ## Supported Platforms
 
@@ -53,3 +53,11 @@ requestFileSystem(LocalFileSystem.APPKINETICS, 0, function(gdFileSystem) {
     });
 }, null);
 ```
+
+## License
+
+Apache 2.0 License
+
+## Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-bbd-sqlite-storage",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "BlackBerry Dynamics Cordova Sqlite Storage Plugin",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://community.blackberry.com",
@@ -12,10 +12,13 @@
     ]
   },
   "repository": {
-    "name": "https://github.com/blackberry/BlackBerry-Dynamics-Cordova-Plugins/tree/sqlite-storage",
-    "version": "1.0.0",
-    "private": true
+    "name": "cordova-plugin-bbd-sqlite-storage",
+    "version": "1.1.0",
+    "private": true,
+    "type": "git",
+    "url": "https://github.com/blackberry/BlackBerry-Dynamics-Cordova-Plugins/tree/sqlite-storage"
   },
+  "bugs": "https://github.com/blackberry/BlackBerry-Dynamics-Cordova-Plugins/tree/sqlite-storage/issues",
   "keywords": [
     "sqlite",
     "ecosystem:cordova",

plugin.xml

@@ -1,22 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright (c) 2020 BlackBerry Limited. All Rights Reserved.
+  Some modifications to the original cordova-sqlite-storage
+  from https://github.com/litehelpers/Cordova-sqlite-storage/
+
+  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.
+-->
+
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-bbd-sqlite-storage"
-        version="1.0.0">
+        version="1.1.0">
 
     <name>cordova-plugin-bbd-sqlite-storage</name>
     <description>BlackBerry Dynamics Cordova Sqlite Storage Plugin</description>
     <license>SEE LICENSE IN LICENSE</license>
     <keywords>cordova,plugin,sqlite</keywords>
 
     <info>
-        The SQLite Storage plugin is dependent on Base and Dynamics File plugins, so please make sure Base and File plugins are installed correctly.
+        The SQLite Storage plugin is dependent on Base plugin, so please make sure the Base plugin is installed correctly.
 
         Original Cordova SQLite Storage plugin link: https://github.com/xpbrew/cordova-sqlite-storage
     </info>
 
     <dependency id="cordova-plugin-bbd-file"
-        url="git+https://github.com/blackberry/BlackBerry-Dynamics-Cordova-Plugins#file" version="^1.0.0" />
+        url="git+https://github.com/blackberry/blackberry-dynamics-cordova-plugins#file" version="^1.1.0" />
 
     <js-module src="www/SQLitePlugin.js" name="SQLitePlugin">
         <clobbers target="window.openDatabase" />

src/ios/SQLitePluginBD.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 BlackBerry Limited. All Rights Reserved.
+ * Copyright (c) 2021 BlackBerry Limited. All Rights Reserved.
  * Some modifications to the original Cordova SQLite Storage plugin
  * from https://github.com/xpbrew/cordova-sqlite-storage/
  *
@@ -12,8 +12,8 @@
 
 #import "SQLitePluginBD.h"
 
-#import <GD/sqlite3enc.h>
-#import <GD/GDFileManager.h>
+#import <BlackBerryDynamics/GD_C/sqlite3enc.h>
+#import <BlackBerryDynamics/GD/GDFileManager.h>
 
 // Defines Macro to only log lines when in DEBUG mode
 #ifdef DEBUG