Skip to content

Commit dcb0707

Browse files
kazlauskiskazlauskis
committed
Update dependencies
1 parent c642837 commit dcb0707

File tree

29 files changed

+3057
-3648
lines changed

29 files changed

+3057
-3648
lines changed

‎android/app/capacitor.build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_17
6-
targetCompatibility JavaVersion.VERSION_17
5+
sourceCompatibility JavaVersion.VERSION_21
6+
targetCompatibility JavaVersion.VERSION_21
77
}
88
}
99

1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-community-sqlite')
13-
implementation project(':capacitor-community-camera-preview')
1413
implementation project(':capacitor-app')
1514
implementation project(':capacitor-camera')
1615
implementation project(':capacitor-device')
@@ -19,8 +18,10 @@ dependencies {
1918
implementation project(':capacitor-haptics')
2019
implementation project(':capacitor-keyboard')
2120
implementation project(':capacitor-network')
21+
implementation project(':capacitor-share')
2222
implementation project(':capacitor-splash-screen')
2323
implementation project(':capacitor-status-bar')
24+
implementation project(':capacitor-blob-writer')
2425

2526
}
2627

‎android/app/src/main/AndroidManifest.xml

+18-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher"
5-
android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round"
6-
android:supportsRtl="true" android:theme="@style/AppTheme">
4+
<application
5+
android:allowBackup="true"
6+
android:icon="@mipmap/ic_launcher"
7+
android:label="@string/app_name"
8+
android:roundIcon="@mipmap/ic_launcher_round"
9+
android:supportsRtl="true"
10+
android:theme="@style/AppTheme">
711

812
<activity
9-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
10-
android:name=".MainActivity" android:label="@string/title_activity_main"
11-
android:theme="@style/AppTheme.NoActionBarLaunch" android:launchMode="singleTask"
13+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
14+
android:name=".MainActivity"
15+
android:label="@string/title_activity_main"
16+
android:theme="@style/AppTheme.NoActionBarLaunch"
17+
android:launchMode="singleTask"
1218
android:exported="true">
1319

1420
<intent-filter>
@@ -18,10 +24,13 @@
1824

1925
</activity>
2026

21-
<provider android:name="androidx.core.content.FileProvider"
22-
android:authorities="${applicationId}.fileprovider" android:exported="false"
27+
<provider
28+
android:name="androidx.core.content.FileProvider"
29+
android:authorities="${applicationId}.fileprovider"
30+
android:exported="false"
2331
android:grantUriPermissions="true">
24-
<meta-data android:name="android.support.FILE_PROVIDER_PATHS"
32+
<meta-data
33+
android:name="android.support.FILE_PROVIDER_PATHS"
2534
android:resource="@xml/file_paths"></meta-data>
2635
</provider>
2736
</application>

‎android/app/src/main/assets/capacitor.plugins.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
"pkg": "@capacitor-community/sqlite",
44
"classpath": "com.getcapacitor.community.database.sqlite.CapacitorSQLitePlugin"
55
},
6-
{
7-
"pkg": "@capacitor-community/camera-preview",
8-
"classpath": "com.ahm.capacitor.camera.preview.CameraPreview"
9-
},
106
{
117
"pkg": "@capacitor/app",
128
"classpath": "com.capacitorjs.plugins.app.AppPlugin"
@@ -39,12 +35,20 @@
3935
"pkg": "@capacitor/network",
4036
"classpath": "com.capacitorjs.plugins.network.NetworkPlugin"
4137
},
38+
{
39+
"pkg": "@capacitor/share",
40+
"classpath": "com.capacitorjs.plugins.share.SharePlugin"
41+
},
4242
{
4343
"pkg": "@capacitor/splash-screen",
4444
"classpath": "com.capacitorjs.plugins.splashscreen.SplashScreenPlugin"
4545
},
4646
{
4747
"pkg": "@capacitor/status-bar",
4848
"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
49+
},
50+
{
51+
"pkg": "capacitor-blob-writer",
52+
"classpath": "com.equimaps.capacitorblobwriter.BlobWriter"
4953
}
5054
]

‎android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.2.1'
11-
classpath 'com.google.gms:google-services:4.4.0'
10+
classpath 'com.android.tools.build:gradle:8.7.2'
11+
classpath 'com.google.gms:google-services:4.4.2'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎android/capacitor.settings.gradle

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
55
include ':capacitor-community-sqlite'
66
project(':capacitor-community-sqlite').projectDir = new File('../node_modules/@capacitor-community/sqlite/android')
77

8-
include ':capacitor-community-camera-preview'
9-
project(':capacitor-community-camera-preview').projectDir = new File('../node_modules/@capacitor-community/camera-preview/android')
10-
118
include ':capacitor-app'
129
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
1310

@@ -32,8 +29,14 @@ project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor
3229
include ':capacitor-network'
3330
project(':capacitor-network').projectDir = new File('../node_modules/@capacitor/network/android')
3431

32+
include ':capacitor-share'
33+
project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
34+
3535
include ':capacitor-splash-screen'
3636
project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capacitor/splash-screen/android')
3737

3838
include ':capacitor-status-bar'
3939
project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
40+
41+
include ':capacitor-blob-writer'
42+
project(':capacitor-blob-writer').projectDir = new File('../node_modules/capacitor-blob-writer/android')

‎android/gradle/wrapper/gradle-wrapper.jar

-19.3 KB
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
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

+13-9
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

+12-10
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/variables.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
2-
minSdkVersion = 22
3-
compileSdkVersion = 34
4-
targetSdkVersion = 34
5-
androidxActivityVersion = '1.8.0'
6-
androidxAppCompatVersion = '1.6.1'
2+
minSdkVersion = 23
3+
compileSdkVersion = 35
4+
targetSdkVersion = 35
5+
androidxActivityVersion = '1.9.2'
6+
androidxAppCompatVersion = '1.7.0'
77
androidxCoordinatorLayoutVersion = '1.2.0'
8-
androidxCoreVersion = '1.12.0'
9-
androidxFragmentVersion = '1.6.2'
8+
androidxCoreVersion = '1.15.0'
9+
androidxFragmentVersion = '1.8.4'
1010
coreSplashScreenVersion = '1.0.1'
11-
androidxWebkitVersion = '1.9.0'
11+
androidxWebkitVersion = '1.12.1'
1212
junitVersion = '4.13.2'
13-
androidxJunitVersion = '1.1.5'
14-
androidxEspressoCoreVersion = '3.5.1'
13+
androidxJunitVersion = '1.2.1'
14+
androidxEspressoCoreVersion = '3.6.1'
1515
cordovaAndroidVersion = '10.1.1'
1616
}

‎ios/App/App.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
284284
GCC_WARN_UNUSED_FUNCTION = YES;
285285
GCC_WARN_UNUSED_VARIABLE = YES;
286-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
286+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
287287
MTL_ENABLE_DEBUG_INFO = YES;
288288
ONLY_ACTIVE_ARCH = YES;
289289
SDKROOT = iphoneos;
@@ -334,7 +334,7 @@
334334
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
335335
GCC_WARN_UNUSED_FUNCTION = YES;
336336
GCC_WARN_UNUSED_VARIABLE = YES;
337-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
337+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
338338
MTL_ENABLE_DEBUG_INFO = NO;
339339
SDKROOT = iphoneos;
340340
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -352,7 +352,7 @@
352352
CURRENT_PROJECT_VERSION = 3;
353353
DEVELOPMENT_TEAM = X4GARM6E7K;
354354
INFOPLIST_FILE = App/Info.plist;
355-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
355+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
356356
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
357357
MARKETING_VERSION = 1.0;
358358
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
@@ -374,7 +374,7 @@
374374
CURRENT_PROJECT_VERSION = 3;
375375
DEVELOPMENT_TEAM = X4GARM6E7K;
376376
INFOPLIST_FILE = App/Info.plist;
377-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
377+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
378378
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
379379
MARKETING_VERSION = 1.0;
380380
PRODUCT_BUNDLE_IDENTIFIER = uk.ac.ceh.ir;

‎ios/App/App/capacitor.config.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"cordova": {},
66
"packageClassList": [
77
"CapacitorSQLitePlugin",
8-
"CameraPreview",
98
"AppPlugin",
109
"CAPCameraPlugin",
1110
"DevicePlugin",
@@ -14,7 +13,9 @@
1413
"HapticsPlugin",
1514
"KeyboardPlugin",
1615
"CAPNetworkPlugin",
16+
"SharePlugin",
1717
"SplashScreenPlugin",
18-
"StatusBarPlugin"
18+
"StatusBarPlugin",
19+
"BlobWriter"
1920
]
2021
}

‎ios/App/Podfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
22

3-
platform :ios, '13.0'
3+
platform :ios, '14.0'
44
use_frameworks!
55

66
# workaround to avoid Xcode caching of Pods that requires
@@ -12,7 +12,6 @@ def capacitor_pods
1212
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
1313
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
1414
pod 'CapacitorCommunitySqlite', :path => '../../node_modules/@capacitor-community/sqlite'
15-
pod 'CapacitorCommunityCameraPreview', :path => '../../node_modules/@capacitor-community/camera-preview'
1615
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
1716
pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
1817
pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'
@@ -21,8 +20,10 @@ def capacitor_pods
2120
pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
2221
pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
2322
pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network'
23+
pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
2424
pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
2525
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
26+
pod 'CapacitorBlobWriter', :path => '../../node_modules/capacitor-blob-writer'
2627
end
2728

2829
target 'App' do

0 commit comments

Comments
 (0)