cordova-sqlite-ext remove duplicate macOS ("osx") section from plugin…

….xml
brodycj · Dec 20, 2017 · 73da6c5 · 73da6c5
1 parent 0eb9dac
commit 73da6c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 32 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## cordova-sqlite-ext 0.10.7-pre1
+
+TBD
+
 ## cordova-sqlite-ext 0.10.6
 
 - SQLite 3.15.2 build with SQLITE_THREADSAFE=2 on macOS ONLY (SQLITE_THREADSAFE=1 on Android/iOS/Windows) and other flag fixes in this plugin version

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlite-ext",
-  "version": "0.10.6",
+  "version": "0.10.7-pre1",
   "description": "Native interface to SQLite for PhoneGap/Cordova with extra features",
   "cordova": {
     "id": "cordova-sqlite-ext",

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlite-ext"
-    version="0.10.6">
+    version="0.10.7-pre1">
 
     <name>Cordova sqlite storage plugin with extra features</name>
 
@@ -72,7 +72,7 @@
                      compiler-flags="-DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE  -DSQLITE_OMIT_BUILTIN_TEST -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DEFAULT_PAGE_SIZE=1024 -DSQLITE_DEFAULT_CACHE_SIZE=2000" />
     </platform>
 
-    <!-- macOS -->
+    <!-- macOS (osx) -->
     <platform name="osx">
         <config-file target="config.xml" parent="/*">
             <feature name="SQLitePlugin">
@@ -102,35 +102,6 @@
                      compiler-flags="-DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE=1024 -DSQLITE_DEFAULT_CACHE_SIZE=2000" />
     </platform>
 
-    <!-- macOS (osx) -->
-    <platform name="osx">
-        <config-file target="config.xml" parent="/*">
-            <feature name="SQLitePlugin">
-                <param name="ios-package" value="SQLitePlugin" />
-            </feature>
-        </config-file>
-
-        <!-- 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" />
-
-        <header-file src="src/ios/PSPDFThreadSafeMutableDictionary.h" />
-        <source-file src="src/ios/PSPDFThreadSafeMutableDictionary.m" />
-
-        <header-file src="node_modules/cordova-sqlite-ext-deps/sqlite3-regexp-cached/sqlite3_regexp.h" />
-        <source-file src="node_modules/cordova-sqlite-ext-deps/sqlite3-regexp-cached/sqlite3_regexp.c" />
-
-        <header-file src="node_modules/cordova-sqlite-ext-deps/sqlite3-base64/sqlite3_base64.h" />
-        <source-file src="node_modules/cordova-sqlite-ext-deps/sqlite3-base64/sqlite3_base64.c" />
-
-        <header-file src="node_modules/cordova-sqlite-ext-deps/libb64-encode/cencode.h" />
-        <source-file src="node_modules/cordova-sqlite-ext-deps/libb64-encode/cencode.c" />
-
-        <header-file src="node_modules/cordova-sqlite-storage-dependencies/sqlite3.h" />
-        <source-file src="node_modules/cordova-sqlite-storage-dependencies/sqlite3.c"
-                     compiler-flags="-DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE=1024" />
-    </platform>
-
     <!-- windows -->
     <platform name="windows">
         <js-module src="src/windows/sqlite-proxy.js" name="SQLiteProxy">