Skip to content

Commit 011a436

Browse files
committed
chore: update iOS deployment target to 13.0 and remove unused dependencies
1 parent 1dea3e1 commit 011a436

File tree

6 files changed

+89
-135
lines changed

6 files changed

+89
-135
lines changed

example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
# platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Podfile.lock

Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,101 @@
11
PODS:
2+
- DKImagePickerController/Core (4.3.9):
3+
- DKImagePickerController/ImageDataManager
4+
- DKImagePickerController/Resource
5+
- DKImagePickerController/ImageDataManager (4.3.9)
6+
- DKImagePickerController/PhotoGallery (4.3.9):
7+
- DKImagePickerController/Core
8+
- DKPhotoGallery
9+
- DKImagePickerController/Resource (4.3.9)
10+
- DKPhotoGallery (0.0.19):
11+
- DKPhotoGallery/Core (= 0.0.19)
12+
- DKPhotoGallery/Model (= 0.0.19)
13+
- DKPhotoGallery/Preview (= 0.0.19)
14+
- DKPhotoGallery/Resource (= 0.0.19)
15+
- SDWebImage
16+
- SwiftyGif
17+
- DKPhotoGallery/Core (0.0.19):
18+
- DKPhotoGallery/Model
19+
- DKPhotoGallery/Preview
20+
- SDWebImage
21+
- SwiftyGif
22+
- DKPhotoGallery/Model (0.0.19):
23+
- SDWebImage
24+
- SwiftyGif
25+
- DKPhotoGallery/Preview (0.0.19):
26+
- DKPhotoGallery/Model
27+
- DKPhotoGallery/Resource
28+
- SDWebImage
29+
- SwiftyGif
30+
- DKPhotoGallery/Resource (0.0.19):
31+
- SDWebImage
32+
- SwiftyGif
33+
- file_picker (0.0.1):
34+
- DKImagePickerController/PhotoGallery
35+
- Flutter
236
- fjs (1.0.0):
337
- Flutter
438
- Flutter (1.0.0)
539
- integration_test (0.0.1):
640
- Flutter
41+
- path_provider_foundation (0.0.1):
42+
- Flutter
43+
- FlutterMacOS
44+
- SDWebImage (5.21.2):
45+
- SDWebImage/Core (= 5.21.2)
46+
- SDWebImage/Core (5.21.2)
47+
- shared_preferences_foundation (0.0.1):
48+
- Flutter
49+
- FlutterMacOS
50+
- SwiftyGif (5.4.5)
51+
- url_launcher_ios (0.0.1):
52+
- Flutter
753

854
DEPENDENCIES:
55+
- file_picker (from `.symlinks/plugins/file_picker/ios`)
956
- fjs (from `.symlinks/plugins/fjs/ios`)
1057
- Flutter (from `Flutter`)
1158
- integration_test (from `.symlinks/plugins/integration_test/ios`)
59+
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
60+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
61+
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
62+
63+
SPEC REPOS:
64+
trunk:
65+
- DKImagePickerController
66+
- DKPhotoGallery
67+
- SDWebImage
68+
- SwiftyGif
1269

1370
EXTERNAL SOURCES:
71+
file_picker:
72+
:path: ".symlinks/plugins/file_picker/ios"
1473
fjs:
1574
:path: ".symlinks/plugins/fjs/ios"
1675
Flutter:
1776
:path: Flutter
1877
integration_test:
1978
:path: ".symlinks/plugins/integration_test/ios"
79+
path_provider_foundation:
80+
:path: ".symlinks/plugins/path_provider_foundation/darwin"
81+
shared_preferences_foundation:
82+
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
83+
url_launcher_ios:
84+
:path: ".symlinks/plugins/url_launcher_ios/ios"
2085

2186
SPEC CHECKSUMS:
22-
fjs: aa20b25710d1c622169ce051301f77e4f7e4a4d6
23-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
24-
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
87+
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
88+
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
89+
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
90+
fjs: 8836a5b8e1282ed5dc284d37b420ec5fbeb56516
91+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
92+
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
93+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
94+
SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
95+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
96+
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
97+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
2598

26-
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
99+
PODFILE CHECKSUM: 4f1c12611da7338d21589c0b2ecd6bd20b109694
27100

28101
COCOAPODS: 1.16.2

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
455455
GCC_WARN_UNUSED_FUNCTION = YES;
456456
GCC_WARN_UNUSED_VARIABLE = YES;
457-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
457+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
458458
MTL_ENABLE_DEBUG_INFO = NO;
459459
SDKROOT = iphoneos;
460460
SUPPORTED_PLATFORMS = iphoneos;
@@ -584,7 +584,7 @@
584584
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
585585
GCC_WARN_UNUSED_FUNCTION = YES;
586586
GCC_WARN_UNUSED_VARIABLE = YES;
587-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
587+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
588588
MTL_ENABLE_DEBUG_INFO = YES;
589589
ONLY_ACTIVE_ARCH = YES;
590590
SDKROOT = iphoneos;
@@ -635,7 +635,7 @@
635635
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
636636
GCC_WARN_UNUSED_FUNCTION = YES;
637637
GCC_WARN_UNUSED_VARIABLE = YES;
638-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
638+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
639639
MTL_ENABLE_DEBUG_INFO = NO;
640640
SDKROOT = iphoneos;
641641
SUPPORTED_PLATFORMS = iphoneos;

libfjs/Cargo.lock

Lines changed: 0 additions & 122 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libfjs/Cargo.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ crate-type = ["cdylib", "staticlib"]
88

99
[dependencies]
1010
anyhow = "1"
11-
log = "0"
1211
flutter_rust_bridge = "=2.11.1"
1312
rquickjs = { git = "https://github.com/DelSkayn/rquickjs.git", version = "0.9.0", features = ["full-async", "bindgen", "loader", "dyn-load", "parallel", "macro", "futures"] }
1413
tokio = { version = "1", features = ["full"] }
@@ -27,7 +26,6 @@ llrt_fetch = { git = "https://github.com/awslabs/llrt", rev = "cc2207e", default
2726
llrt_fs = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
2827
llrt_navigator = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
2928
llrt_net = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
30-
llrt_os = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
3129
llrt_path = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
3230
llrt_process = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
3331
llrt_perf_hooks = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
@@ -48,8 +46,13 @@ pkcs1 = "=0.8.0-rc.4"
4846
block-padding = "=0.4.0-rc.4"
4947
flate2 = { version = "1.1.4", default-features = false, features = ["zlib-rs"] }
5048

51-
[dev-dependencies]
52-
env_logger = "0"
49+
[features]
50+
default = []
51+
os-module = []
52+
53+
# Platform-specific dependencies
54+
[target.'cfg(not(target_os = "ios"))'.dependencies]
55+
llrt_os = { git = "https://github.com/awslabs/llrt", rev = "cc2207e" }
5356

5457
[lints.rust]
5558
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(frb_expand)'] }

libfjs/src/api/js.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,6 @@ impl JsBuiltinOptions {
17721772
.with_module(llrt_console::ConsoleModule);
17731773
}
17741774

1775-
#[cfg(not(target_os = "android"))]
17761775
if self.crypto.unwrap_or(false) {
17771776
builder = builder
17781777
.with_global(llrt_crypto::init)
@@ -1811,6 +1810,7 @@ impl JsBuiltinOptions {
18111810
builder = builder.with_module(llrt_net::NetModule);
18121811
}
18131812

1813+
#[cfg(not(target_os = "ios"))]
18141814
if self.os.unwrap_or(false) {
18151815
builder = builder.with_module(llrt_os::OsModule);
18161816
}

0 commit comments

Comments
 (0)