Skip to content

Commit 2f3de04

Browse files
authored
Merge branch 'main' into main
2 parents eef66ba + b2ba7d7 commit 2f3de04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4307
-1419
lines changed
Loading

open_earable/ios/Podfile.lock

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ PODS:
2020
- path_provider_foundation (0.0.1):
2121
- Flutter
2222
- FlutterMacOS
23-
- permission_handler_apple (9.1.1):
23+
- permission_handler_apple (9.3.0):
2424
- Flutter
2525
- Protobuf (3.24.3)
2626
- reactive_ble_mobile (0.0.1):
2727
- Flutter
2828
- Protobuf (~> 3.5)
2929
- SwiftProtobuf (~> 1.0)
30+
- shared_preferences_foundation (0.0.1):
31+
- Flutter
32+
- FlutterMacOS
3033
- SwiftProtobuf (1.23.0)
3134
- three3d_egl (0.1.3)
3235

@@ -40,6 +43,7 @@ DEPENDENCIES:
4043
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
4144
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
4245
- reactive_ble_mobile (from `.symlinks/plugins/reactive_ble_mobile/ios`)
46+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
4347

4448
SPEC REPOS:
4549
trunk:
@@ -67,6 +71,8 @@ EXTERNAL SOURCES:
6771
:path: ".symlinks/plugins/permission_handler_apple/ios"
6872
reactive_ble_mobile:
6973
:path: ".symlinks/plugins/reactive_ble_mobile/ios"
74+
shared_preferences_foundation:
75+
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
7076

7177
SPEC CHECKSUMS:
7278
app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc
@@ -80,6 +86,7 @@ SPEC CHECKSUMS:
8086
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
8187
Protobuf: 970f7ee93a3a08e3cf64859b8efd95ee32b4f87f
8288
reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
89+
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
8390
SwiftProtobuf: b70d65f419fbfe61a2d58003456ca5da58e337d6
8491
three3d_egl: de2cd4950ad2d5f2122166c36583bde4c812e7b5
8592

open_earable/ios/Runner/Info.plist

+57-62
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,61 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>CADisableMinimumFrameDurationOnPhone</key>
6-
<true/>
7-
<key>CFBundleDevelopmentRegion</key>
8-
<string>$(DEVELOPMENT_LANGUAGE)</string>
9-
<key>CFBundleDisplayName</key>
10-
<string>OpenEarable</string>
11-
<key>CFBundleExecutable</key>
12-
<string>$(EXECUTABLE_NAME)</string>
13-
<key>CFBundleIdentifier</key>
14-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
15-
<key>CFBundleInfoDictionaryVersion</key>
16-
<string>6.0</string>
17-
<key>CFBundleName</key>
18-
<string>OpenEarable</string>
19-
<key>CFBundlePackageType</key>
20-
<string>APPL</string>
21-
<key>CFBundleShortVersionString</key>
22-
<string>$(FLUTTER_BUILD_NAME)</string>
23-
<key>CFBundleSignature</key>
24-
<string>????</string>
25-
<key>CFBundleVersion</key>
26-
<string>$(FLUTTER_BUILD_NUMBER)</string>
27-
<key>ITSAppUsesNonExemptEncryption</key>
28-
<false/>
29-
<key>LSApplicationCategoryType</key>
30-
<string>aps-environment</string>
31-
<key>LSRequiresIPhoneOS</key>
32-
<true/>
33-
<key>NSBluetoothAlwaysUsageDescription</key>
34-
<string>This app uses bluetooth to connect to earable devices</string>
35-
<key>NSBluetoothPeripheralUsageDescription</key>
36-
<string>This app uses bluetooth to connect to earable devices</string>
37-
<key>UIApplicationSupportsIndirectInputEvents</key>
38-
<true/>
39-
<key>UIBackgroundModes</key>
40-
<array>
41-
<string>fetch</string>
42-
<string>remote-notification</string>
43-
</array>
44-
<key>UILaunchStoryboardName</key>
45-
<string>LaunchScreen</string>
46-
<key>UIMainStoryboardFile</key>
47-
<string>Main</string>
48-
<key>UISupportedInterfaceOrientations</key>
49-
<array>
50-
<string>UIInterfaceOrientationPortrait</string>
51-
<string>UIInterfaceOrientationLandscapeLeft</string>
52-
<string>UIInterfaceOrientationLandscapeRight</string>
53-
</array>
54-
<key>UISupportedInterfaceOrientations~ipad</key>
55-
<array>
56-
<string>UIInterfaceOrientationPortrait</string>
57-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
58-
<string>UIInterfaceOrientationLandscapeLeft</string>
59-
<string>UIInterfaceOrientationLandscapeRight</string>
60-
</array>
61-
<key>UIViewControllerBasedStatusBarAppearance</key>
62-
<false/>
63-
<key>UIStatusBarHidden</key>
64-
<false/>
65-
</dict>
4+
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>$(DEVELOPMENT_LANGUAGE)</string>
9+
<key>CFBundleDisplayName</key>
10+
<string>OpenEarable</string>
11+
<key>CFBundleExecutable</key>
12+
<string>$(EXECUTABLE_NAME)</string>
13+
<key>CFBundleIdentifier</key>
14+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
15+
<key>CFBundleInfoDictionaryVersion</key>
16+
<string>6.0</string>
17+
<key>CFBundleName</key>
18+
<string>OpenEarable</string>
19+
<key>CFBundlePackageType</key>
20+
<string>APPL</string>
21+
<key>CFBundleShortVersionString</key>
22+
<string>$(FLUTTER_BUILD_NAME)</string>
23+
<key>CFBundleSignature</key>
24+
<string>????</string>
25+
<key>CFBundleVersion</key>
26+
<string>$(FLUTTER_BUILD_NUMBER)</string>
27+
<key>ITSAppUsesNonExemptEncryption</key>
28+
<false/>
29+
<key>LSApplicationCategoryType</key>
30+
<string>aps-environment</string>
31+
<key>LSRequiresIPhoneOS</key>
32+
<true/>
33+
<key>NSBluetoothAlwaysUsageDescription</key>
34+
<string>This app uses bluetooth to connect to earable devices</string>
35+
<key>NSBluetoothPeripheralUsageDescription</key>
36+
<string>This app uses bluetooth to connect to earable devices</string>
37+
<key>UIApplicationSupportsIndirectInputEvents</key>
38+
<true/>
39+
<key>UILaunchStoryboardName</key>
40+
<string>LaunchScreen</string>
41+
<key>UIMainStoryboardFile</key>
42+
<string>Main</string>
43+
<key>UIStatusBarHidden</key>
44+
<false/>
45+
<key>UISupportedInterfaceOrientations</key>
46+
<array>
47+
<string>UIInterfaceOrientationPortrait</string>
48+
<string>UIInterfaceOrientationLandscapeLeft</string>
49+
<string>UIInterfaceOrientationLandscapeRight</string>
50+
</array>
51+
<key>UISupportedInterfaceOrientations~ipad</key>
52+
<array>
53+
<string>UIInterfaceOrientationPortrait</string>
54+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
55+
<string>UIInterfaceOrientationLandscapeLeft</string>
56+
<string>UIInterfaceOrientationLandscapeRight</string>
57+
</array>
58+
<key>UIViewControllerBasedStatusBarAppearance</key>
59+
<false/>
60+
</dict>
6661
</plist>
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>aps-environment</key>
6-
<string>development</string>
7-
</dict>
4+
<dict/>
85
</plist>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>aps-environment</key>
6-
<string>development</string>
7-
</dict>
4+
<dict/>
85
</plist>

open_earable/ios/ci_scripts/ci_post_clone.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -e
55

66
# by default, the execution directory of this script is the ci_scripts directory
77
# CI_WORKSPACE is the directory of your cloned repo
8-
echo "🟩 Navigate from ($PWD) to ($CI_WORKSPACE)"
9-
cd $CI_WORKSPACE
8+
echo "🟩 Navigate from ($PWD) to ($CI_WORKSPACE_PATH)"
9+
cd $CI_WORKSPACE_PATH
1010

1111
echo "🟩 Install Flutter"
1212
time git clone https://github.com/flutter/flutter.git -b stable $HOME/flutter
@@ -16,7 +16,7 @@ echo "🟩 Flutter Precache"
1616
time flutter precache --ios
1717

1818
echo "🟩 Install Flutter Dependencies"
19-
cd open_earable
19+
cd repository/open_earable
2020
time flutter clean
2121
time flutter pub get
2222
time flutter pub upgrade
Loading

0 commit comments

Comments
 (0)