Skip to content

Commit

Permalink
update iOS to pass through SwiftLint
Browse files Browse the repository at this point in the history
  • Loading branch information
jepiqueau committed Aug 3, 2020
1 parent 324abbf commit cf8c504
Show file tree
Hide file tree
Showing 26 changed files with 1,892 additions and 1,230 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 2.3.0-beta3 (2020-08-03)

### Bug Fixes

- Rewrite the iOS Plugin to pass through SwiftLint

## 2.3.0-beta.2 (2020-07-28)

### Bug Fixes

- Fix iOS issues due to the move to capacitor-community

## 2.3.0-2 (2020-07-25)

### Added Features
Expand All @@ -18,7 +30,7 @@

### Chores

- Capacitor: update 2.2.1
- Capacitor: update 2.3.0

## 2.2.1-3 (2020-07-15)

Expand Down
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/dw/@capacitor-community/sqlite?style=flat-square" /></a>
<a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/v/@capacitor-community/sqlite?style=flat-square" /></a>
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-0-orange?style=flat-square" /></a>
<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-1-orange?style=flat-square" /></a>
<!-- ALL-CONTRIBUTORS-BADGE:END -->
</p>

Expand Down Expand Up @@ -307,3 +307,23 @@ No configuration required for this plugin

The IOS and Android codes are using SQLCipher allowing for database encryption
The Electron code use sqlite3

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://github.com/jepiqueau"><img src="https://avatars3.githubusercontent.com/u/16580653?v=4" width="100px;" alt=""/><br /><sub><b>Jean Pierre Quéau</b></sub></a><br /><a href="https://github.com/capacitor-community/sqlite/commits?author=jepiqueau" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-enable -->
<!-- prettier-ignore-end -->

<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
Binary file modified android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified android/.idea/caches/build_file_checksums.ser
Binary file not shown.
23 changes: 21 additions & 2 deletions android/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified android/build/intermediates/aar_main_jar/debug/classes.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Fri Jul 24 19:55:09 CEST 2020
#Mon Aug 03 13:37:35 CEST 2020
/Users/queaujeanpierre/Documents/capacitor-community/sqlite/android/src/main/res/layout/bridge_layout_main.xml=/Users/queaujeanpierre/Documents/capacitor-community/sqlite/android/build/intermediates/packaged_res/debug/layout/bridge_layout_main.xml
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified android/build/outputs/aar/android-debug.aar
Binary file not shown.
36 changes: 32 additions & 4 deletions ios/Plugin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
/* Begin PBXBuildFile section */
03FC29A292ACC40490383A1F /* Pods_Plugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */; };
20C0B05DCFC8E3958A738AF2 /* Pods_PluginTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */; };
2C6C636D2447835200EED166 /* JsonSQLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6C636C2447835200EED166 /* JsonSQLite.swift */; };
2C3CF92424D070DA001E24F2 /* ReturnHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3CF92324D070DA001E24F2 /* ReturnHandler.swift */; };
2C6A011D24D82B9000A46075 /* JsonSQLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6A011A24D82B9000A46075 /* JsonSQLite.swift */; };
2C6A011E24D82B9000A46075 /* ImportFromJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6A011B24D82B9000A46075 /* ImportFromJson.swift */; };
2C6A011F24D82B9000A46075 /* ExportToJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6A011C24D82B9000A46075 /* ExportToJson.swift */; };
2C6A012224D82BCF00A46075 /* UtilsBinding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6A012024D82BCF00A46075 /* UtilsBinding.swift */; };
2C6A012324D82BCF00A46075 /* UtilsJson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6A012124D82BCF00A46075 /* UtilsJson.swift */; };
2C77B2E52421082E0059C80C /* UtilsSQLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C77B2E32421082E0059C80C /* UtilsSQLite.swift */; };
2C77B2E9242108480059C80C /* GlobalSQLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C77B2E7242108480059C80C /* GlobalSQLite.swift */; };
2C77B2EA242108480059C80C /* DatabaseSQLiteHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C77B2E8242108480059C80C /* DatabaseSQLiteHelper.swift */; };
Expand All @@ -32,7 +37,12 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
2C6C636C2447835200EED166 /* JsonSQLite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JsonSQLite.swift; sourceTree = "<group>"; };
2C3CF92324D070DA001E24F2 /* ReturnHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReturnHandler.swift; sourceTree = "<group>"; };
2C6A011A24D82B9000A46075 /* JsonSQLite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JsonSQLite.swift; sourceTree = "<group>"; };
2C6A011B24D82B9000A46075 /* ImportFromJson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportFromJson.swift; sourceTree = "<group>"; };
2C6A011C24D82B9000A46075 /* ExportToJson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExportToJson.swift; sourceTree = "<group>"; };
2C6A012024D82BCF00A46075 /* UtilsBinding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsBinding.swift; sourceTree = "<group>"; };
2C6A012124D82BCF00A46075 /* UtilsJson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsJson.swift; sourceTree = "<group>"; };
2C77B2E32421082E0059C80C /* UtilsSQLite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsSQLite.swift; sourceTree = "<group>"; };
2C77B2E7242108480059C80C /* GlobalSQLite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalSQLite.swift; sourceTree = "<group>"; };
2C77B2E8242108480059C80C /* DatabaseSQLiteHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseSQLiteHelper.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -75,9 +85,21 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
2C6A011924D82B9000A46075 /* ImportExportJson */ = {
isa = PBXGroup;
children = (
2C6A011C24D82B9000A46075 /* ExportToJson.swift */,
2C6A011B24D82B9000A46075 /* ImportFromJson.swift */,
2C6A011A24D82B9000A46075 /* JsonSQLite.swift */,
);
path = ImportExportJson;
sourceTree = "<group>";
};
2C77B2E22421082E0059C80C /* Utils */ = {
isa = PBXGroup;
children = (
2C6A012024D82BCF00A46075 /* UtilsBinding.swift */,
2C6A012124D82BCF00A46075 /* UtilsJson.swift */,
2C77B2E32421082E0059C80C /* UtilsSQLite.swift */,
);
path = Utils;
Expand Down Expand Up @@ -106,14 +128,15 @@
50ADFF8A201F53D600D50D53 /* Plugin */ = {
isa = PBXGroup;
children = (
2C6A011924D82B9000A46075 /* ImportExportJson */,
2C77B2E8242108480059C80C /* DatabaseSQLiteHelper.swift */,
2C77B2E7242108480059C80C /* GlobalSQLite.swift */,
2C6C636C2447835200EED166 /* JsonSQLite.swift */,
50E1A94720377CB70090CE1A /* Plugin.swift */,
50ADFF8B201F53D600D50D53 /* Plugin.h */,
50ADFFA72020EE4F00D50D53 /* Plugin.m */,
2C77B2E22421082E0059C80C /* Utils */,
50ADFF8C201F53D600D50D53 /* Info.plist */,
2C3CF92324D070DA001E24F2 /* ReturnHandler.swift */,
);
path = Plugin;
sourceTree = "<group>";
Expand Down Expand Up @@ -325,11 +348,16 @@
buildActionMask = 2147483647;
files = (
2C77B2EA242108480059C80C /* DatabaseSQLiteHelper.swift in Sources */,
2C6C636D2447835200EED166 /* JsonSQLite.swift in Sources */,
50E1A94820377CB70090CE1A /* Plugin.swift in Sources */,
2C3CF92424D070DA001E24F2 /* ReturnHandler.swift in Sources */,
2C6A012224D82BCF00A46075 /* UtilsBinding.swift in Sources */,
2C6A011E24D82B9000A46075 /* ImportFromJson.swift in Sources */,
2C77B2E9242108480059C80C /* GlobalSQLite.swift in Sources */,
50ADFFA82020EE4F00D50D53 /* Plugin.m in Sources */,
2C77B2E52421082E0059C80C /* UtilsSQLite.swift in Sources */,
2C6A011F24D82B9000A46075 /* ExportToJson.swift in Sources */,
2C6A011D24D82B9000A46075 /* JsonSQLite.swift in Sources */,
2C6A012324D82BCF00A46075 /* UtilsJson.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file not shown.
Loading

0 comments on commit cf8c504

Please sign in to comment.