Skip to content

Commit a4ad7ee

Browse files
authored
feat!: update to Capacitor 7 (#620)
* feat!: update to Capacitor 7 * wip * style: format * wip * fix
1 parent 891377f commit a4ad7ee

File tree

30 files changed

+2621
-1226
lines changed

30 files changed

+2621
-1226
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
NODE_VERSION: 18
12-
JAVA_VERSION: 17
11+
NODE_VERSION: 20
12+
JAVA_VERSION: 21
1313

1414
jobs:
1515
build:
1616
name: Build
17-
runs-on: macos-14
17+
runs-on: macos-15
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v4
@@ -44,7 +44,7 @@ jobs:
4444
path: dist
4545
lint:
4646
name: Lint
47-
runs-on: macos-14
47+
runs-on: macos-15
4848
steps:
4949
- name: Checkout
5050
uses: actions/checkout@v4

.prettierignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

CapacitorCommunitySqlite.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '13.0'
14+
s.ios.deployment_target = '14.0'
1515
s.dependency 'Capacitor'
1616
s.dependency 'SQLCipher'
1717
s.dependency 'ZIPFoundation'

android/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
4-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
5-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
4+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
5+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
66
}
77

88
buildscript {
@@ -19,13 +19,13 @@ apply plugin: 'com.android.library'
1919

2020
android {
2121
namespace "com.getcapacitor.community.database.sqlite"
22-
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
22+
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
2323
packagingOptions {
2424
exclude 'build-data.properties'
2525
}
2626
defaultConfig {
27-
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
28-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
27+
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
28+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
2929
versionCode 1
3030
versionName "1.0"
3131
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,8 +40,8 @@ android {
4040
abortOnError false
4141
}
4242
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_17
44-
targetCompatibility JavaVersion.VERSION_17
43+
sourceCompatibility JavaVersion.VERSION_21
44+
targetCompatibility JavaVersion.VERSION_21
4545
}
4646
}
4747

-19.3 KB
Binary file not shown.

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
8385
# This is normally unused
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8791

8892
# Use the maximum available, or set MAX_FD != -1 to use that value.
8993
MAX_FD=maximum
@@ -144,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
146150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
148152
MAX_FD=$( ulimit -H -n ) ||
149153
warn "Could not query maximum file descriptor limit"
150154
esac
151155
case $MAX_FD in #(
152156
'' | soft) :;; #(
153157
*)
154158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
156160
ulimit -n "$MAX_FD" ||
157161
warn "Could not set maximum file descriptor limit to $MAX_FD"
158162
esac
@@ -201,11 +205,11 @@ fi
201205
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202206
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203207

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
209213

210214
set -- \
211215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

android/gradlew.bat

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLite.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,10 @@ public void onSuccess(BiometricPrompt.AuthenticationResult result) {
9292
ks.load(null);
9393
Enumeration<String> aliases = ks.aliases();
9494
if (aliases.hasMoreElements()) {
95-
masterKeyAlias =
96-
new MasterKey.Builder(context)
97-
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
98-
.setUserAuthenticationRequired(true, VALIDITY_DURATION)
99-
.build();
95+
masterKeyAlias = new MasterKey.Builder(context)
96+
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
97+
.setUserAuthenticationRequired(true, VALIDITY_DURATION)
98+
.build();
10099
} else {
101100
masterKeyAlias = new MasterKey.Builder(context).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build();
102101
}
@@ -149,14 +148,13 @@ private void notifyBiometricEvent(Boolean ret, String msg) {
149148
private void setSharedPreferences() throws Exception {
150149
try {
151150
// get instance of the EncryptedSharedPreferences class
152-
this.sharedPreferences =
153-
EncryptedSharedPreferences.create(
154-
context,
155-
"sqlite_encrypted_shared_prefs",
156-
masterKeyAlias,
157-
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
158-
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
159-
);
151+
this.sharedPreferences = EncryptedSharedPreferences.create(
152+
context,
153+
"sqlite_encrypted_shared_prefs",
154+
masterKeyAlias,
155+
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
156+
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
157+
);
160158
this.uSecret = new UtilsSecret(this.context, this.sharedPreferences);
161159
} catch (Exception e) {
162160
throw new Exception(e.getMessage());

android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLitePlugin.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,7 @@ public void getFromHTTPRequest(PluginCall call) {
15491549
}
15501550

15511551
private void AddObserversToNotificationCenter() {
1552-
NotificationCenter
1553-
.defaultCenter()
1552+
NotificationCenter.defaultCenter()
15541553
.addMethodForNotification(
15551554
"importJsonProgress",
15561555
new MyRunnable() {
@@ -1562,8 +1561,7 @@ public void run() {
15621561
}
15631562
}
15641563
);
1565-
NotificationCenter
1566-
.defaultCenter()
1564+
NotificationCenter.defaultCenter()
15671565
.addMethodForNotification(
15681566
"exportJsonProgress",
15691567
new MyRunnable() {
@@ -1575,8 +1573,7 @@ public void run() {
15751573
}
15761574
}
15771575
);
1578-
NotificationCenter
1579-
.defaultCenter()
1576+
NotificationCenter.defaultCenter()
15801577
.addMethodForNotification(
15811578
"biometricResults",
15821579
new MyRunnable() {

0 commit comments

Comments
 (0)