Skip to content

Commit fa42a06

Browse files
committed
fix macos and ios
1 parent cafb6f0 commit fa42a06

File tree

5 files changed

+89
-95
lines changed

5 files changed

+89
-95
lines changed

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, '12.0'
33

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

ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,6 @@ SPEC CHECKSUMS:
137137
sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
138138
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
139139

140-
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
140+
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
141141

142142
COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,14 @@
212212
inputFileListPaths = (
213213
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
214214
);
215+
inputPaths = (
216+
);
215217
name = "[CP] Embed Pods Frameworks";
216218
outputFileListPaths = (
217219
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
218220
);
221+
outputPaths = (
222+
);
219223
runOnlyForDeploymentPostprocessing = 0;
220224
shellPath = /bin/sh;
221225
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -245,10 +249,14 @@
245249
inputFileListPaths = (
246250
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
247251
);
252+
inputPaths = (
253+
);
248254
name = "[CP] Copy Pods Resources";
249255
outputFileListPaths = (
250256
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
251257
);
258+
outputPaths = (
259+
);
252260
runOnlyForDeploymentPostprocessing = 0;
253261
shellPath = /bin/sh;
254262
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -269,23 +277,6 @@
269277
shellPath = /bin/sh;
270278
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
271279
};
272-
9964CF9BE27615006489D488 /* [CP] Copy Pods Resources */ = {
273-
isa = PBXShellScriptBuildPhase;
274-
buildActionMask = 2147483647;
275-
files = (
276-
);
277-
inputFileListPaths = (
278-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
279-
);
280-
name = "[CP] Copy Pods Resources";
281-
outputFileListPaths = (
282-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
283-
);
284-
runOnlyForDeploymentPostprocessing = 0;
285-
shellPath = /bin/sh;
286-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
287-
showEnvVarsInLog = 0;
288-
};
289280
A23E1C57A48CD5731ACA870B /* [CP] Check Pods Manifest.lock */ = {
290281
isa = PBXShellScriptBuildPhase;
291282
buildActionMask = 2147483647;
@@ -408,7 +399,7 @@
408399
"$(inherited)",
409400
"@executable_path/Frameworks",
410401
);
411-
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet;
402+
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet.store;
412403
PRODUCT_NAME = "$(TARGET_NAME)";
413404
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
414405
SWIFT_VERSION = 5.0;
@@ -541,7 +532,7 @@
541532
"$(inherited)",
542533
"@executable_path/Frameworks",
543534
);
544-
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet;
535+
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet.store;
545536
PRODUCT_NAME = "$(TARGET_NAME)";
546537
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
547538
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -566,7 +557,7 @@
566557
"$(inherited)",
567558
"@executable_path/Frameworks",
568559
);
569-
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet;
560+
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet.store;
570561
PRODUCT_NAME = "$(TARGET_NAME)";
571562
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
572563
SWIFT_VERSION = 5.0;

ios/Runner/Info.plist

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
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>CFBundleExecutable</key>
10-
<string>$(EXECUTABLE_NAME)</string>
11-
<key>CFBundleIdentifier</key>
12-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13-
<key>CFBundleInfoDictionaryVersion</key>
14-
<string>6.0</string>
15-
<key>CFBundleName</key>
16-
<string>vernet</string>
17-
<key>CFBundlePackageType</key>
18-
<string>APPL</string>
19-
<key>CFBundleShortVersionString</key>
20-
<string>$(FLUTTER_BUILD_NAME)</string>
21-
<key>CFBundleSignature</key>
22-
<string>????</string>
23-
<key>CFBundleVersion</key>
24-
<string>$(FLUTTER_BUILD_NUMBER)</string>
25-
<key>LSApplicationQueriesSchemes</key>
26-
<array>
27-
<string>https</string>
28-
<string>http</string>
29-
</array>
30-
<key>LSRequiresIPhoneOS</key>
31-
<true/>
32-
<key>NSLocationWhenInUseUsageDescription</key>
33-
<string>This app requires accessing your location information when the app is in foreground to get wi-fi information.</string>
34-
<key>UILaunchStoryboardName</key>
35-
<string>LaunchScreen</string>
36-
<key>UIMainStoryboardFile</key>
37-
<string>Main</string>
38-
<key>UISupportedInterfaceOrientations</key>
39-
<array>
40-
<string>UIInterfaceOrientationPortrait</string>
41-
<string>UIInterfaceOrientationLandscapeLeft</string>
42-
<string>UIInterfaceOrientationLandscapeRight</string>
43-
</array>
44-
<key>UISupportedInterfaceOrientations~ipad</key>
45-
<array>
46-
<string>UIInterfaceOrientationPortrait</string>
47-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
48-
<string>UIInterfaceOrientationLandscapeLeft</string>
49-
<string>UIInterfaceOrientationLandscapeRight</string>
50-
</array>
51-
<key>UIViewControllerBasedStatusBarAppearance</key>
52-
<false/>
53-
<key>com.apple.developer.networking.wifi-info</key>
54-
<true/>
55-
<key>UIApplicationSupportsIndirectInputEvents</key>
56-
<true/>
57-
<key>NSLocalNetworkUsageDescription</key>
58-
<string>Required to discover local network devices</string>
59-
<key>NSBonjourServices</key>
60-
<array>
61-
<string>_http._tcp</string>
62-
</array>
63-
<key>UIStatusBarHidden</key>
64-
<true/>
65-
</dict>
4+
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>$(DEVELOPMENT_LANGUAGE)</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>vernet</string>
17+
<key>CFBundlePackageType</key>
18+
<string>APPL</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>$(FLUTTER_BUILD_NAME)</string>
21+
<key>CFBundleSignature</key>
22+
<string>????</string>
23+
<key>CFBundleVersion</key>
24+
<string>$(FLUTTER_BUILD_NUMBER)</string>
25+
<key>LSApplicationQueriesSchemes</key>
26+
<array>
27+
<string>https</string>
28+
<string>http</string>
29+
</array>
30+
<key>LSRequiresIPhoneOS</key>
31+
<true/>
32+
<key>NSBonjourServices</key>
33+
<array>
34+
<string>_http._tcp</string>
35+
</array>
36+
<key>NSLocalNetworkUsageDescription</key>
37+
<string>Required to discover local network devices</string>
38+
<key>NSLocationWhenInUseUsageDescription</key>
39+
<string>This app requires accessing your location information when the app is in foreground to get wi-fi information.</string>
40+
<key>UIApplicationSupportsIndirectInputEvents</key>
41+
<true/>
42+
<key>UILaunchStoryboardName</key>
43+
<string>LaunchScreen</string>
44+
<key>UIMainStoryboardFile</key>
45+
<string>Main</string>
46+
<key>UIStatusBarHidden</key>
47+
<true/>
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>com.apple.developer.networking.wifi-info</key>
64+
<true/>
65+
</dict>
6666
</plist>

macos/Podfile.lock

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,31 @@ PODS:
1818
- shared_preferences_foundation (0.0.1):
1919
- Flutter
2020
- FlutterMacOS
21-
- sqlite3 (3.49.1):
22-
- sqlite3/common (= 3.49.1)
23-
- sqlite3/common (3.49.1)
24-
- sqlite3/dbstatvtab (3.49.1):
21+
- sqlite3 (3.50.4):
22+
- sqlite3/common (= 3.50.4)
23+
- sqlite3/common (3.50.4)
24+
- sqlite3/dbstatvtab (3.50.4):
2525
- sqlite3/common
26-
- sqlite3/fts5 (3.49.1):
26+
- sqlite3/fts5 (3.50.4):
2727
- sqlite3/common
28-
- sqlite3/math (3.49.1):
28+
- sqlite3/math (3.50.4):
2929
- sqlite3/common
30-
- sqlite3/perf-threadsafe (3.49.1):
30+
- sqlite3/perf-threadsafe (3.50.4):
3131
- sqlite3/common
32-
- sqlite3/rtree (3.49.1):
32+
- sqlite3/rtree (3.50.4):
33+
- sqlite3/common
34+
- sqlite3/session (3.50.4):
3335
- sqlite3/common
3436
- sqlite3_flutter_libs (0.0.1):
3537
- Flutter
3638
- FlutterMacOS
37-
- sqlite3 (~> 3.49.1)
39+
- sqlite3 (~> 3.50.4)
3840
- sqlite3/dbstatvtab
3941
- sqlite3/fts5
4042
- sqlite3/math
4143
- sqlite3/perf-threadsafe
4244
- sqlite3/rtree
45+
- sqlite3/session
4346
- url_launcher_macos (0.0.1):
4447
- FlutterMacOS
4548

@@ -94,8 +97,8 @@ SPEC CHECKSUMS:
9497
package_info_plus: f0052d280d17aa382b932f399edf32507174e870
9598
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
9699
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
97-
sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983
98-
sqlite3_flutter_libs: f6acaa2172e6bb3e2e70c771661905080e8ebcf2
100+
sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
101+
sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
99102
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
100103

101104
PODFILE CHECKSUM: 4d1ddd58dcd1dc92dd2b397bbacb622f345603ab

0 commit comments

Comments
 (0)