Skip to content

Commit 8647160

Browse files
XavierPaquet-RapoldApplets
XavierPaquet-Rapold
and
Applets
authored
Fix ios build (#1264)
* Fix ios project * Upgrade version * [BOT] Applying pod update. --------- Co-authored-by: Applets <applets@etsmtl.ca>
1 parent 3ce8356 commit 8647160

File tree

6 files changed

+51
-32
lines changed

6 files changed

+51
-32
lines changed

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
/* Begin PBXFileReference section */
4444
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4545
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
46+
18DF603C2E0E03F4005F91AA /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
4647
235CD647A447BE7FFCC1E896 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4748
25E64E2C1BA1A2C8A4334AB2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
4849
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
@@ -96,7 +97,6 @@
9697
235CD647A447BE7FFCC1E896 /* Pods-Runner.release.xcconfig */,
9798
25E64E2C1BA1A2C8A4334AB2 /* Pods-Runner.profile.xcconfig */,
9899
);
99-
name = Pods;
100100
path = Pods;
101101
sourceTree = "<group>";
102102
};
@@ -143,6 +143,7 @@
143143
97C146F01CF9000F007C117D /* Runner */ = {
144144
isa = PBXGroup;
145145
children = (
146+
18DF603C2E0E03F4005F91AA /* Runner.entitlements */,
146147
97C146FA1CF9000F007C117D /* Main.storyboard */,
147148
97C146FD1CF9000F007C117D /* Assets.xcassets */,
148149
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -461,16 +462,21 @@
461462
buildSettings = {
462463
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
463464
CLANG_ENABLE_MODULES = YES;
465+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
466+
CODE_SIGN_STYLE = Manual;
464467
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
465-
DEVELOPMENT_TEAM = N742HF354K;
468+
DEVELOPMENT_TEAM = "";
469+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = N742HF354K;
466470
ENABLE_BITCODE = NO;
467471
INFOPLIST_FILE = Runner/Info.plist;
468472
LD_RUNPATH_SEARCH_PATHS = (
469473
"$(inherited)",
470474
"@executable_path/Frameworks",
471475
);
472-
PRODUCT_BUNDLE_IDENTIFIER = ca.etsmtl.applets.etsmobile;
476+
PRODUCT_BUNDLE_IDENTIFIER = ca.etsmtl.applets.ETSMobile;
473477
PRODUCT_NAME = "$(TARGET_NAME)";
478+
PROVISIONING_PROFILE_SPECIFIER = "";
479+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development ca.etsmtl.applets.ETSMobile";
474480
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
475481
SWIFT_VERSION = 5.0;
476482
VERSIONING_SYSTEM = "apple-generic";
@@ -641,16 +647,21 @@
641647
buildSettings = {
642648
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
643649
CLANG_ENABLE_MODULES = YES;
650+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
651+
CODE_SIGN_STYLE = Manual;
644652
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
645-
DEVELOPMENT_TEAM = N742HF354K;
653+
DEVELOPMENT_TEAM = "";
654+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = N742HF354K;
646655
ENABLE_BITCODE = NO;
647656
INFOPLIST_FILE = Runner/Info.plist;
648657
LD_RUNPATH_SEARCH_PATHS = (
649658
"$(inherited)",
650659
"@executable_path/Frameworks",
651660
);
652-
PRODUCT_BUNDLE_IDENTIFIER = ca.etsmtl.applets.etsmobile;
661+
PRODUCT_BUNDLE_IDENTIFIER = ca.etsmtl.applets.ETSMobile;
653662
PRODUCT_NAME = "$(TARGET_NAME)";
663+
PROVISIONING_PROFILE_SPECIFIER = "";
664+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development ca.etsmtl.applets.ETSMobile";
654665
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
655666
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
656667
SWIFT_VERSION = 5.0;
@@ -664,16 +675,22 @@
664675
buildSettings = {
665676
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
666677
CLANG_ENABLE_MODULES = YES;
678+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
679+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
680+
CODE_SIGN_STYLE = Manual;
667681
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
668-
DEVELOPMENT_TEAM = N742HF354K;
682+
DEVELOPMENT_TEAM = "";
683+
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = N742HF354K;
669684
ENABLE_BITCODE = NO;
670685
INFOPLIST_FILE = Runner/Info.plist;
671686
LD_RUNPATH_SEARCH_PATHS = (
672687
"$(inherited)",
673688
"@executable_path/Frameworks",
674689
);
675-
PRODUCT_BUNDLE_IDENTIFIER = ca.etsmtl.applets.etsmobile;
690+
PRODUCT_BUNDLE_IDENTIFIER = ca.etsmtl.applets.ETSMobile;
676691
PRODUCT_NAME = "$(TARGET_NAME)";
692+
PROVISIONING_PROFILE_SPECIFIER = "";
693+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore ca.etsmtl.applets.ETSMobile";
677694
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
678695
SWIFT_VERSION = 5.0;
679696
VERSIONING_SYSTEM = "apple-generic";

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,6 +44,7 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"

‎ios/Runner/Info.plist‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
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>NSLocationWhenInUseUsageDescription</key>
6-
<string>Imprecise location information for google maps and firebase analytics</string>
75
<key>CADisableMinimumFrameDurationOnPhone</key>
86
<true/>
97
<key>CFBundleDevelopmentRegion</key>
@@ -24,12 +22,34 @@
2422
<string>$(FLUTTER_BUILD_NAME)</string>
2523
<key>CFBundleSignature</key>
2624
<string>????</string>
25+
<key>CFBundleURLTypes</key>
26+
<array>
27+
<dict>
28+
<key>CFBundleURLSchemes</key>
29+
<array>
30+
<string>msauth.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
31+
</array>
32+
</dict>
33+
</array>
2734
<key>CFBundleVersion</key>
2835
<string>$(FLUTTER_BUILD_NUMBER)</string>
2936
<key>LSApplicationCategoryType</key>
3037
<string></string>
38+
<key>LSApplicationQueriesSchemes</key>
39+
<array>
40+
<string>msauthv2</string>
41+
<string>msauthv3</string>
42+
</array>
3143
<key>LSRequiresIPhoneOS</key>
3244
<true/>
45+
<key>NSCalendarsFullAccessUsageDescription</key>
46+
<string>Access most functions for calendar viewing and editing.</string>
47+
<key>NSCalendarsUsageDescription</key>
48+
<string>Access most functions for calendar viewing and editing.</string>
49+
<key>NSContactsUsageDescription</key>
50+
<string>Access contacts for event attendee editing.</string>
51+
<key>NSLocationWhenInUseUsageDescription</key>
52+
<string>Imprecise location information for google maps and firebase analytics</string>
3353
<key>UIApplicationSupportsIndirectInputEvents</key>
3454
<true/>
3555
<key>UILaunchScreen</key>
@@ -53,27 +73,7 @@
5373
<string>UIInterfaceOrientationLandscapeLeft</string>
5474
<string>UIInterfaceOrientationLandscapeRight</string>
5575
</array>
56-
<key>CFBundleURLTypes</key>
57-
<array>
58-
<dict>
59-
<key>CFBundleURLSchemes</key>
60-
<array>
61-
<string>msauth.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
62-
</array>
63-
</dict>
64-
</array>
65-
<key>LSApplicationQueriesSchemes</key>
66-
<array>
67-
<string>msauthv2</string>
68-
<string>msauthv3</string>
69-
</array>
7076
<key>UIViewControllerBasedStatusBarAppearance</key>
7177
<false/>
72-
<key>NSCalendarsUsageDescription</key>
73-
<string>Access most functions for calendar viewing and editing.</string>
74-
<key>NSCalendarsFullAccessUsageDescription</key>
75-
<string>Access most functions for calendar viewing and editing.</string>
76-
<key>NSContactsUsageDescription</key>
77-
<string>Access contacts for event attendee editing.</string>
7878
</dict>
7979
</plist>

‎ios/Runner/Runner.entitlements‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</array>
99
<key>keychain-access-groups</key>
1010
<array>
11-
<string>$(AppIdentifierPrefix)shared.ca.etsmtl.applets.ETSMobile</string>
11+
<string>$(AppIdentifierPrefix)ca.etsmtl.applets.ETSMobile</string>
1212
<string>$(AppIdentifierPrefix)com.microsoft.adalcache</string>
1313
</array>
1414
</dict>

‎ios/fastlane/Matchfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ storage_mode("git")
44

55
type("development") # The default type, can be: appstore, adhoc, enterprise or development
66

7-
app_identifier(["ca.etsmtl.applets.ETSMobile", "ca.etsmtl.applets.ETSMobile.Widget"])
7+
app_identifier(["ca.etsmtl.applets.ETSMobile"])
88
username("applets@etsmtl.net")
99

1010
# The docs are available on https://docs.fastlane.tools/actions/match

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: The 4th generation of ÉTSMobile, the main gateway between the Éco
55
# pub.dev using `pub publish`. This is preferred for private packages.
66
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
77

8-
version: 4.60.0
8+
version: 4.60.1
99

1010
environment:
1111
sdk: '>=3.8.0 <4.0.0'

0 commit comments

Comments
 (0)