Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch:

env:
NODE_VERSION: 20
NODE_VERSION: 22
JAVA_VERSION: 21

jobs:
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Set up Java ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4
with:
distribution: 'zulu'
distribution: "zulu"
java-version: ${{ env.JAVA_VERSION }}
- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion CapacitorCommunitySqlite.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.author = package['author']
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
s.ios.deployment_target = '14.0'
s.ios.deployment_target = '15.0'
s.dependency 'Capacitor'
s.dependency 'SQLCipher'
s.dependency 'ZIPFoundation'
Expand Down
Binary file modified android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
4 changes: 2 additions & 2 deletions android/.gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Wed Jun 12 09:21:54 CEST 2024
gradle.version=8.2.1
#Thu Dec 18 20:32:17 CET 2025
gradle.version=8.14.3
Binary file modified android/.gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
18 changes: 9 additions & 9 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ext {
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
}

buildscript {
Expand All @@ -11,21 +11,21 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.android.tools.build:gradle:8.13.0'
}
}

apply plugin: 'com.android.library'

android {
namespace "com.getcapacitor.community.database.sqlite"
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
namespace = "com.getcapacitor.community.database.sqlite"
compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
packagingOptions {
exclude 'build-data.properties'
}
defaultConfig {
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -37,7 +37,7 @@ android {
}
}
lintOptions {
abortOnError false
abortOnError = false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 4 additions & 5 deletions android/gradlew

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

4 changes: 2 additions & 2 deletions android/gradlew.bat

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

Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,15 @@ public void changeEncryptionSecret(PluginCall call) {
}
oldpassphrase = call.getString("oldpassphrase");
if (implementation != null) {
getActivity()
.runOnUiThread(() -> {
try {
implementation.changeEncryptionSecret(call, passphrase, oldpassphrase);
rHandler.retResult(call, null, null);
} catch (Exception e) {
String msg = "ChangeEncryptionSecret: " + e.getMessage();
rHandler.retResult(call, null, msg);
}
});
getActivity().runOnUiThread(() -> {
try {
implementation.changeEncryptionSecret(call, passphrase, oldpassphrase);
rHandler.retResult(call, null, null);
} catch (Exception e) {
String msg = "ChangeEncryptionSecret: " + e.getMessage();
rHandler.retResult(call, null, msg);
}
});
} else {
rHandler.retResult(call, null, loadMessage);
}
Expand Down Expand Up @@ -1532,11 +1531,10 @@ public void getFromHTTPRequest(PluginCall call) {
implementation.getFromHTTPRequest(url);
getActivity().runOnUiThread(() -> rHandler.retResult(call, null, null));
} catch (Exception e) {
getActivity()
.runOnUiThread(() -> {
String msg = "GetFromHTTPRequest: " + e.getMessage();
rHandler.retResult(call, null, msg);
});
getActivity().runOnUiThread(() -> {
String msg = "GetFromHTTPRequest: " + e.getMessage();
rHandler.retResult(call, null, msg);
});
}
};
Thread myHttpThread = new Thread(setHTTPRunnable);
Expand All @@ -1549,43 +1547,40 @@ public void getFromHTTPRequest(PluginCall call) {
}

private void AddObserversToNotificationCenter() {
NotificationCenter.defaultCenter()
.addMethodForNotification(
"importJsonProgress",
new MyRunnable() {
@Override
public void run() {
JSObject data = new JSObject();
data.put("progress", this.getInfo().get("progress"));
notifyListeners("sqliteImportProgressEvent", data);
}
NotificationCenter.defaultCenter().addMethodForNotification(
"importJsonProgress",
new MyRunnable() {
@Override
public void run() {
JSObject data = new JSObject();
data.put("progress", this.getInfo().get("progress"));
notifyListeners("sqliteImportProgressEvent", data);
}
);
NotificationCenter.defaultCenter()
.addMethodForNotification(
"exportJsonProgress",
new MyRunnable() {
@Override
public void run() {
JSObject data = new JSObject();
data.put("progress", this.getInfo().get("progress"));
notifyListeners("sqliteExportProgressEvent", data);
}
}
);
NotificationCenter.defaultCenter().addMethodForNotification(
"exportJsonProgress",
new MyRunnable() {
@Override
public void run() {
JSObject data = new JSObject();
data.put("progress", this.getInfo().get("progress"));
notifyListeners("sqliteExportProgressEvent", data);
}
);
NotificationCenter.defaultCenter()
.addMethodForNotification(
"biometricResults",
new MyRunnable() {
@Override
public void run() {
JSObject data = new JSObject();
data.put("result", this.getInfo().get("result"));
data.put("message", this.getInfo().get("message"));
notifyListeners("sqliteBiometricEvent", data);
}
}
);
NotificationCenter.defaultCenter().addMethodForNotification(
"biometricResults",
new MyRunnable() {
@Override
public void run() {
JSObject data = new JSObject();
data.put("result", this.getInfo().get("result"));
data.put("message", this.getInfo().get("message"));
notifyListeners("sqliteBiometricEvent", data);
}
);
}
);
}

private SqliteConfig getSqliteConfig() throws JSONException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public synchronized void removeMethodForNotification(String notificationName, My
}

public synchronized void removeAllNotifications() {
for (Iterator<Map.Entry<String, ArrayList<MyRunnable>>> entry = registredObjects.entrySet().iterator(); entry.hasNext();) {
for (Iterator<Map.Entry<String, ArrayList<MyRunnable>>> entry = registredObjects.entrySet().iterator(); entry.hasNext(); ) {
Map.Entry<String, ArrayList<MyRunnable>> e = entry.next();
String key = e.getKey();
ArrayList<MyRunnable> value = e.getValue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ private JSONObject generateInsertAndDeletedStrings(ArrayList<String> tColNames,
", ",
rowIndex
.stream()
.map(item -> {
.map((item) -> {
if (item instanceof String) {
String val = (String) item;
String rVal = val;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public static List<Map<String, Object>> JSArrayToJavaListMap(JSArray jsArray) th
Map<String, Object> map = new HashMap<>();

// Extract key-value pairs from the JSObject and put them into the Map
for (Iterator<String> it = jsObject.keys(); it.hasNext();) {
for (Iterator<String> it = jsObject.keys(); it.hasNext(); ) {
String key = it.next();
map.put(key, jsObject.get(key)); // Convert JSValue to Java object
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ public void dropTempTables(Database db, Dictionary<String, List<String>> alterTa
*/
public List<String> getDictStringKeys(Dictionary<String, List<String>> dict) {
List<String> lkeys = new ArrayList<>();
for (Enumeration<String> keys = dict.keys(); keys.hasMoreElements();) {
for (Enumeration<String> keys = dict.keys(); keys.hasMoreElements(); ) {
String keyVal = keys.nextElement();
lkeys.add(keyVal);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ public static List<String> extractColumnNames(String whereClause) {

Pattern pattern = Pattern.compile(
"\\b[a-zA-Z]\\w*\\b(?=\\s*(?:<=?|>=?|<>?|=|AND|OR|BETWEEN|NOT|IN|LIKE))|" +
"\\b[a-zA-Z]\\w*\\b\\s+BETWEEN\\s+'[^']+'\\s+AND\\s+'[^']+'|" +
"\\(([^)]+)\\)\\s+IN\\s+\\(\\s*VALUES\\s*\\("
"\\b[a-zA-Z]\\w*\\b\\s+BETWEEN\\s+'[^']+'\\s+AND\\s+'[^']+'|" +
"\\(([^)]+)\\)\\s+IN\\s+\\(\\s*VALUES\\s*\\("
);
Matcher matcher = pattern.matcher(whereClause);
List<String> columns = new ArrayList<>();
Expand Down
36 changes: 18 additions & 18 deletions electron/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"declaration": true,
"experimentalDecorators": true,
"noEmitHelpers": true,
"importHelpers": true,
"lib": ["dom", "esnext"],
"module": "commonjs",
"noImplicitAny": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"outDir": "build",
"sourceMap": true,
"strict": false,
"target": "ES2020"
},
"include": ["src/**/*"]
}
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"declaration": true,
"experimentalDecorators": true,
"noEmitHelpers": true,
"importHelpers": true,
"lib": ["dom", "esnext"],
"module": "commonjs",
"noImplicitAny": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"outDir": "build",
"sourceMap": true,
"strict": false,
"target": "ES2020"
},
"include": ["src/**/*"]
}
8 changes: 4 additions & 4 deletions ios/Plugin.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -594,7 +594,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -617,7 +617,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
Expand Down Expand Up @@ -670,7 +670,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Plugin/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '14.0'
platform :ios, '15.0'

def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
Expand Down
Loading