Skip to content

Commit 8364f01

Browse files
AlexV525AlexV525
committed
🔥 iOS / MacOS code cleanup.
1 parent b8e91cf commit 8364f01

File tree

4 files changed

+75
-87
lines changed

4 files changed

+75
-87
lines changed

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -121,7 +121,6 @@
121121
713E22BCE39FB127B8A0E6C1 /* Pods-Runner.release.xcconfig */,
122122
B3E25C4F9EEE9734FC2DF87F /* Pods-Runner.profile.xcconfig */,
123123
);
124-
name = Pods;
125124
path = Pods;
126125
sourceTree = "<group>";
127126
};
@@ -253,23 +252,12 @@
253252
buildActionMask = 2147483647;
254253
files = (
255254
);
256-
inputPaths = (
257-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
258-
"${PODS_ROOT}/../Flutter/Flutter.framework",
259-
"${BUILT_PRODUCTS_DIR}/camera/camera.framework",
260-
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
261-
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
262-
"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
263-
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
255+
inputFileListPaths = (
256+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
264257
);
265258
name = "[CP] Embed Pods Frameworks";
266-
outputPaths = (
267-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
268-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/camera.framework",
269-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
270-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
271-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
272-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
259+
outputFileListPaths = (
260+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
273261
);
274262
runOnlyForDeploymentPostprocessing = 0;
275263
shellPath = /bin/sh;
@@ -367,18 +355,22 @@
367355
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
368356
CLANG_ENABLE_MODULES = YES;
369357
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
358+
DEVELOPMENT_TEAM = 64MAFNBS88;
370359
ENABLE_BITCODE = NO;
371360
FRAMEWORK_SEARCH_PATHS = (
372361
"$(inherited)",
373362
"$(PROJECT_DIR)/Flutter",
374363
);
375364
INFOPLIST_FILE = Runner/Info.plist;
376-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
365+
LD_RUNPATH_SEARCH_PATHS = (
366+
"$(inherited)",
367+
"@executable_path/Frameworks",
368+
);
377369
LIBRARY_SEARCH_PATHS = (
378370
"$(inherited)",
379371
"$(PROJECT_DIR)/Flutter",
380372
);
381-
PRODUCT_BUNDLE_IDENTIFIER = com.example.wechatAssetsPickerDemo;
373+
PRODUCT_BUNDLE_IDENTIFIER = com.fluttercandies.wechatAssetsPickerDemo;
382374
PRODUCT_NAME = "$(TARGET_NAME)";
383375
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
384376
SWIFT_VERSION = 5.0;
@@ -486,7 +478,8 @@
486478
MTL_ENABLE_DEBUG_INFO = NO;
487479
SDKROOT = iphoneos;
488480
SUPPORTED_PLATFORMS = iphoneos;
489-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
481+
SWIFT_COMPILATION_MODE = wholemodule;
482+
SWIFT_OPTIMIZATION_LEVEL = "-O";
490483
TARGETED_DEVICE_FAMILY = "1,2";
491484
VALIDATE_PRODUCT = YES;
492485
};
@@ -499,18 +492,22 @@
499492
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
500493
CLANG_ENABLE_MODULES = YES;
501494
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
495+
DEVELOPMENT_TEAM = 64MAFNBS88;
502496
ENABLE_BITCODE = NO;
503497
FRAMEWORK_SEARCH_PATHS = (
504498
"$(inherited)",
505499
"$(PROJECT_DIR)/Flutter",
506500
);
507501
INFOPLIST_FILE = Runner/Info.plist;
508-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
502+
LD_RUNPATH_SEARCH_PATHS = (
503+
"$(inherited)",
504+
"@executable_path/Frameworks",
505+
);
509506
LIBRARY_SEARCH_PATHS = (
510507
"$(inherited)",
511508
"$(PROJECT_DIR)/Flutter",
512509
);
513-
PRODUCT_BUNDLE_IDENTIFIER = com.example.wechatAssetsPickerDemo;
510+
PRODUCT_BUNDLE_IDENTIFIER = com.fluttercandies.wechatAssetsPickerDemo;
514511
PRODUCT_NAME = "$(TARGET_NAME)";
515512
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
516513
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -526,18 +523,22 @@
526523
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
527524
CLANG_ENABLE_MODULES = YES;
528525
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
526+
DEVELOPMENT_TEAM = 64MAFNBS88;
529527
ENABLE_BITCODE = NO;
530528
FRAMEWORK_SEARCH_PATHS = (
531529
"$(inherited)",
532530
"$(PROJECT_DIR)/Flutter",
533531
);
534532
INFOPLIST_FILE = Runner/Info.plist;
535-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
533+
LD_RUNPATH_SEARCH_PATHS = (
534+
"$(inherited)",
535+
"@executable_path/Frameworks",
536+
);
536537
LIBRARY_SEARCH_PATHS = (
537538
"$(inherited)",
538539
"$(PROJECT_DIR)/Flutter",
539540
);
540-
PRODUCT_BUNDLE_IDENTIFIER = com.example.wechatAssetsPickerDemo;
541+
PRODUCT_BUNDLE_IDENTIFIER = com.fluttercandies.wechatAssetsPickerDemo;
541542
PRODUCT_NAME = "$(TARGET_NAME)";
542543
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
543544
SWIFT_VERSION = 5.0;

‎example/ios/Runner/Info.plist

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,55 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
7-
<key>CFBundleExecutable</key>
8-
<string>$(EXECUTABLE_NAME)</string>
9-
<key>CFBundleIdentifier</key>
10-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11-
<key>CFBundleInfoDictionaryVersion</key>
12-
<string>6.0</string>
13-
<key>CFBundleName</key>
14-
<string>com.fluttercandies.wechatAssetsPickerExample</string>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
157
<key>CFBundleDisplayName</key>
168
<string>Wechat Assets Picker Example</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>LSRequiresIPhoneOS</key>
26-
<true/>
27-
<key>NSAppTransportSecurity</key>
28-
<dict>
29-
<key>NSAllowsArbitraryLoads</key>
30-
<true/>
31-
</dict>
32-
<key>NSPhotoLibraryUsageDescription</key>
33-
<string>Read your photos for display</string>
34-
<key>NSCameraUsageDescription</key>
35-
<string>Take a photo for display</string>
36-
<key>UILaunchStoryboardName</key>
37-
<string>LaunchScreen</string>
38-
<key>UIMainStoryboardFile</key>
39-
<string>Main</string>
40-
<key>UISupportedInterfaceOrientations</key>
41-
<array>
42-
<string>UIInterfaceOrientationPortrait</string>
43-
<string>UIInterfaceOrientationLandscapeLeft</string>
44-
<string>UIInterfaceOrientationLandscapeRight</string>
45-
</array>
46-
<key>UISupportedInterfaceOrientations~ipad</key>
47-
<array>
48-
<string>UIInterfaceOrientationPortrait</string>
49-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
50-
<string>UIInterfaceOrientationLandscapeLeft</string>
51-
<string>UIInterfaceOrientationLandscapeRight</string>
52-
</array>
53-
<key>UIViewControllerBasedStatusBarAppearance</key>
54-
<false/>
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>com.fluttercandies.wechatAssetsPickerExample</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>LSRequiresIPhoneOS</key>
26+
<true/>
27+
<key>NSAppTransportSecurity</key>
28+
<dict>
29+
<key>NSAllowsArbitraryLoads</key>
30+
<true/>
31+
</dict>
32+
<key>NSCameraUsageDescription</key>
33+
<string>Take a photo for display</string>
34+
<key>NSPhotoLibraryUsageDescription</key>
35+
<string>Read your photos for display</string>
36+
<key>UILaunchStoryboardName</key>
37+
<string>LaunchScreen</string>
38+
<key>UIMainStoryboardFile</key>
39+
<string>Main</string>
40+
<key>UISupportedInterfaceOrientations</key>
41+
<array>
42+
<string>UIInterfaceOrientationPortrait</string>
43+
<string>UIInterfaceOrientationLandscapeLeft</string>
44+
<string>UIInterfaceOrientationLandscapeRight</string>
45+
</array>
46+
<key>UISupportedInterfaceOrientations~ipad</key>
47+
<array>
48+
<string>UIInterfaceOrientationPortrait</string>
49+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
50+
<string>UIInterfaceOrientationLandscapeLeft</string>
51+
<string>UIInterfaceOrientationLandscapeRight</string>
52+
</array>
53+
<key>UIViewControllerBasedStatusBarAppearance</key>
54+
<false/>
5555
</dict>
56-
</plist>
56+
</plist>

‎example/macos/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44

55
# Xcode-related
66
**/xcuserdata/
7+
Flutter/GeneratedPluginRegistrant.swift

‎example/macos/Flutter/GeneratedPluginRegistrant.swift

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

0 commit comments

Comments
 (0)