Skip to content

Commit 4a2c737

Browse files
testableappletestableapple
authored
Update code signing (#787)
1 parent 801653f commit 4a2c737

File tree

2 files changed

+35
-49
lines changed

2 files changed

+35
-49
lines changed

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@
576576
CODE_SIGN_IDENTITY = "Apple Development";
577577
CODE_SIGN_STYLE = Automatic;
578578
CURRENT_PROJECT_VERSION = 1;
579-
DEVELOPMENT_TEAM = "";
579+
DEVELOPMENT_TEAM = EHV7XZLAHA;
580580
ENABLE_USER_SCRIPT_SANDBOXING = YES;
581581
GCC_C_LANGUAGE_STANDARD = gnu17;
582582
GENERATE_INFOPLIST_FILE = YES;
@@ -617,12 +617,10 @@
617617
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
618618
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
619619
CODE_SIGN_ENTITLEMENTS = ScreenSharing/ScreenSharing.entitlements;
620-
CODE_SIGN_IDENTITY = "Apple Development";
621-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
620+
CODE_SIGN_IDENTITY = "Apple Distribution";
622621
CODE_SIGN_STYLE = Manual;
623622
CURRENT_PROJECT_VERSION = 1;
624-
DEVELOPMENT_TEAM = "";
625-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EHV7XZLAHA;
623+
DEVELOPMENT_TEAM = EHV7XZLAHA;
626624
ENABLE_USER_SCRIPT_SANDBOXING = YES;
627625
GCC_C_LANGUAGE_STANDARD = gnu17;
628626
GENERATE_INFOPLIST_FILE = YES;
@@ -640,8 +638,7 @@
640638
MTL_FAST_MATH = YES;
641639
PRODUCT_BUNDLE_IDENTIFIER = io.getstream.video.flutter.dogfooding.ScreenSharing;
642640
PRODUCT_NAME = "$(TARGET_NAME)";
643-
PROVISIONING_PROFILE_SPECIFIER = "";
644-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.getstream.video.flutter.dogfooding.ScreenSharing";
641+
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.getstream.video.flutter.dogfooding.ScreenSharing";
645642
SKIP_INSTALL = YES;
646643
SWIFT_EMIT_LOC_STRINGS = YES;
647644
SWIFT_VERSION = 5.0;
@@ -662,11 +659,9 @@
662659
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
663660
CODE_SIGN_ENTITLEMENTS = ScreenSharing/ScreenSharing.entitlements;
664661
CODE_SIGN_IDENTITY = "Apple Development";
665-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
666-
CODE_SIGN_STYLE = Manual;
662+
CODE_SIGN_STYLE = Automatic;
667663
CURRENT_PROJECT_VERSION = 1;
668-
DEVELOPMENT_TEAM = "";
669-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EHV7XZLAHA;
664+
DEVELOPMENT_TEAM = EHV7XZLAHA;
670665
ENABLE_USER_SCRIPT_SANDBOXING = YES;
671666
GCC_C_LANGUAGE_STANDARD = gnu17;
672667
GENERATE_INFOPLIST_FILE = YES;
@@ -685,7 +680,6 @@
685680
PRODUCT_BUNDLE_IDENTIFIER = io.getstream.video.flutter.dogfooding.ScreenSharing;
686681
PRODUCT_NAME = "$(TARGET_NAME)";
687682
PROVISIONING_PROFILE_SPECIFIER = "";
688-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.getstream.video.flutter.dogfooding.ScreenSharing";
689683
SKIP_INSTALL = YES;
690684
SWIFT_EMIT_LOC_STRINGS = YES;
691685
SWIFT_VERSION = 5.0;
@@ -811,7 +805,7 @@
811805
CODE_SIGN_IDENTITY = "Apple Development";
812806
CODE_SIGN_STYLE = Automatic;
813807
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
814-
DEVELOPMENT_TEAM = "";
808+
DEVELOPMENT_TEAM = EHV7XZLAHA;
815809
ENABLE_BITCODE = NO;
816810
INFOPLIST_FILE = Runner/Info.plist;
817811
INFOPLIST_KEY_CFBundleDisplayName = "Flutter Dogfooding";
@@ -839,12 +833,10 @@
839833
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
840834
CLANG_ENABLE_MODULES = YES;
841835
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
842-
CODE_SIGN_IDENTITY = "Apple Development";
843-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
836+
CODE_SIGN_IDENTITY = "Apple Distribution";
844837
CODE_SIGN_STYLE = Manual;
845838
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
846-
DEVELOPMENT_TEAM = "";
847-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EHV7XZLAHA;
839+
DEVELOPMENT_TEAM = EHV7XZLAHA;
848840
ENABLE_BITCODE = NO;
849841
INFOPLIST_FILE = Runner/Info.plist;
850842
INFOPLIST_KEY_CFBundleDisplayName = "Flutter Dogfooding";
@@ -856,8 +848,7 @@
856848
MARKETING_VERSION = 1.0.0;
857849
PRODUCT_BUNDLE_IDENTIFIER = io.getstream.video.flutter.dogfooding;
858850
PRODUCT_NAME = "$(TARGET_NAME)";
859-
PROVISIONING_PROFILE_SPECIFIER = "";
860-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.getstream.video.flutter.dogfooding 1706028745";
851+
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.getstream.video.flutter.dogfooding";
861852
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
862853
SWIFT_VERSION = 5.0;
863854
VERSIONING_SYSTEM = "apple-generic";

‎dogfooding/ios/fastlane/Fastfile‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
default_platform :ios
2-
import "../../Fastfile"
2+
import '../../Fastfile'
33

44
default_platform(:ios)
55

66
before_all do
7-
if is_ci
8-
setup_ci()
9-
end
7+
setup_ci if is_ci
108
end
119

1210
platform :ios do
13-
1411
lane :archive do |options|
1512
method = options[:method]
1613

@@ -19,7 +16,7 @@ platform :ios do
1916
silent: true,
2017
clean: true,
2118
include_symbols: true,
22-
output_directory: "./dist",
19+
output_directory: './dist',
2320
)
2421
end
2522

@@ -28,7 +25,6 @@ platform :ios do
2825
fetch_dependencies
2926
build_autogenerated_code
3027

31-
3228
sign_enabled = options[:sign_enabled] || false
3329
sign_param = sign_enabled ? '' : '--no-codesign'
3430

@@ -41,10 +37,10 @@ platform :ios do
4137
lane :build_and_deploy do
4238
match(
4339
api_key: appstore_api_key,
44-
type: "appstore",
40+
type: 'appstore',
4541
app_identifier: [
46-
"io.getstream.video.flutter.dogfooding",
47-
"io.getstream.video.flutter.dogfooding.ScreenSharing",
42+
'io.getstream.video.flutter.dogfooding',
43+
'io.getstream.video.flutter.dogfooding.ScreenSharing',
4844
],
4945
readonly: is_ci,
5046
force_for_new_devices: false,
@@ -53,45 +49,45 @@ platform :ios do
5349
current_build_number = app_store_build_number(
5450
api_key: appstore_api_key,
5551
live: false,
56-
app_identifier: "io.getstream.video.flutter.dogfooding",
57-
username: ENV["FASTLANE_APPLE_ID"],
58-
team_id: "EHV7XZLAHA",
59-
platform: "ios",
52+
app_identifier: 'io.getstream.video.flutter.dogfooding',
53+
username: ENV['FASTLANE_APPLE_ID'],
54+
team_id: 'EHV7XZLAHA',
55+
platform: 'ios',
6056
)
61-
57+
6258
increment_build_number(build_number: current_build_number + 1)
6359

6460
build(sign_enabled: true)
65-
archive(method: "app-store")
61+
archive(method: 'app-store')
6662

6763
begin
6864
upload_to_testflight(
6965
api_key: appstore_api_key,
7066
distribute_external: true,
7167
notify_external_testers: true,
7268
groups: ['Internal Testers', 'External Testers'],
73-
changelog: "Lots of amazing new features to test out!",
69+
changelog: 'Lots of amazing new features to test out!',
7470
reject_build_waiting_for_review: false,
7571
skip_waiting_for_build_processing: false,
7672
)
7773
rescue Exception => e
78-
if e.message.include? "Another build is in review"
79-
UI.important("Another build is already in beta review. Skipping beta review submission")
74+
if e.message.include? 'Another build is in review'
75+
UI.important('Another build is already in beta review. Skipping beta review submission')
8076
else
8177
UI.user_error!(e)
8278
end
8379
end
8480
end
8581

8682
private_lane :appstore_api_key do
87-
appstore_api_key ||= app_store_connect_api_key(
88-
key_id: 'MT3PRT8TB7',
89-
issuer_id: '69a6de96-0738-47e3-e053-5b8c7c11a4d1',
90-
key_content: File.read(File.expand_path('~/.ssh/appstore_api_key')),
91-
in_house: false
92-
)
93-
end
94-
83+
@appstore_api_key ||= app_store_connect_api_key(
84+
key_id: 'MT3PRT8TB7',
85+
issuer_id: '69a6de96-0738-47e3-e053-5b8c7c11a4d1',
86+
key_content: ENV.fetch('APPSTORE_API_KEY', nil),
87+
in_house: false
88+
)
89+
end
90+
9591
desc "If `readonly: true` (by default), installs all Certs and Profiles necessary for development and ad-hoc.\nIf `readonly: false`, recreates all Profiles necessary for development and ad-hoc, updates them locally and remotely."
9692
desc "If `register_device: false` (by default), no device registration.\nIf `register_device: true`, will register a new device."
9793
lane :match_me do |options|
@@ -102,7 +98,7 @@ platform :ios do
10298
name: device_name,
10399
udid: device_udid,
104100
api_key: appstore_api_key,
105-
)
101+
)
106102
options[:readonly] = false
107103
end
108104
app_identifiers = [
@@ -119,5 +115,4 @@ platform :ios do
119115
)
120116
end
121117
end
122-
123-
end
118+
end

0 commit comments

Comments
 (0)