From da9f9eb9a1241974009e833da0b5cc8a9857c6ef Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 11:36:40 -0500 Subject: [PATCH 1/8] Explicitly set the team ID --- ios/fastlane/Fastfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 154a687d..716aaa3e 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -18,6 +18,11 @@ default_platform(:ios) platform :ios do + app_identifier "com.emerge.hn.Hacker-News" + apple_id ENV['APPLE_ID'] + team_id ENV['APPLE_TEAM_ID'] + itc_team_id ENV['APPLE_ITC_TEAM_ID'] + desc 'Load ASC API Key information to use in subsequent lanes' lane :load_asc_api_key do app_store_connect_api_key( From f95134e9730514391274b35ab82b4a9736b25fab Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 11:43:57 -0500 Subject: [PATCH 2/8] test --- ios/fastlane/Fastfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 716aaa3e..c5ce2ac1 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -17,11 +17,14 @@ default_platform(:ios) -platform :ios do +for_platform :ios do app_identifier "com.emerge.hn.Hacker-News" apple_id ENV['APPLE_ID'] team_id ENV['APPLE_TEAM_ID'] itc_team_id ENV['APPLE_ITC_TEAM_ID'] +end + +platform :ios do desc 'Load ASC API Key information to use in subsequent lanes' lane :load_asc_api_key do From 7ab5eca75c7a1656ff9f281b1b75ee0745e87362 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 11:53:10 -0500 Subject: [PATCH 3/8] test --- ios/fastlane/Fastfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index c5ce2ac1..c7ecd70c 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -17,15 +17,7 @@ default_platform(:ios) -for_platform :ios do - app_identifier "com.emerge.hn.Hacker-News" - apple_id ENV['APPLE_ID'] - team_id ENV['APPLE_TEAM_ID'] - itc_team_id ENV['APPLE_ITC_TEAM_ID'] -end - platform :ios do - desc 'Load ASC API Key information to use in subsequent lanes' lane :load_asc_api_key do app_store_connect_api_key( @@ -123,7 +115,8 @@ platform :ios do method: export_method, provisioningProfiles: { bundle_identifier => profile_name - } + }, + team_id: ENV['APPLE_TEAM_ID'] } ) end From 108cf2ce56a8f9a9a555af74d5e2f525c6b86732 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 12:03:33 -0500 Subject: [PATCH 4/8] test --- ios/fastlane/Fastfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index c7ecd70c..96287fbc 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -111,6 +111,7 @@ platform :ios do scheme: 'HackerNews', output_name: output_name, configuration: 'Release', + export_team_id: ENV['APPLE_TEAM_ID'], export_options: { method: export_method, provisioningProfiles: { From 5f1d88553ce6fa4c45816940278d1cb71573d8fa Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 12:06:01 -0500 Subject: [PATCH 5/8] test --- ios/fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 96287fbc..96af300d 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -103,7 +103,8 @@ platform :ios do code_sign_identity: 'Apple Distribution', bundle_identifier: bundle_identifier, profile_name: profile_name, - build_configurations: ['Release'] + build_configurations: ['Release'], + team_id: ENV['APPLE_TEAM_ID'] ) # build the app From b91a34f303029501973fda5035a4b7e8a54162fa Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 12:08:54 -0500 Subject: [PATCH 6/8] bump fastlane --- ios/Gemfile.lock | 89 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock index 02eee758..ce1a18d7 100644 --- a/ios/Gemfile.lock +++ b/ios/Gemfile.lock @@ -5,41 +5,59 @@ GEM base64 nkf rexml + activesupport (8.0.0) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.962.0) - aws-sdk-core (3.201.3) + aws-partitions (1.1015.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.157.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.175.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.8) claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) + drb (2.2.1) emoji_regex (3.2.3) - excon (0.111.0) - faraday (1.10.3) + excon (0.112.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -65,10 +83,10 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.3.1) - fastlane (2.222.0) + fastlane (2.225.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -84,6 +102,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -109,9 +128,14 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - fastlane-plugin-emerge (0.10.6) - faraday (~> 1.1) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) + git (2.3.2) + activesupport (>= 5.0) + addressable (~> 2.8) + process_executer (~> 1.1) + rchardet (~> 1.8) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.3) @@ -149,35 +173,41 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) + i18n (1.14.6) + concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.2) - jwt (2.8.2) + json (2.8.2) + jwt (2.9.3) base64 + logger (1.6.2) mini_magick (4.13.2) mini_mime (1.1.5) + minitest (5.25.2) multi_json (1.15.0) multipart-post (2.4.1) - nanaimo (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.5.0) + optparse (0.6.0) os (1.1.4) plist (3.7.1) - public_suffix (5.1.1) + process_executer (1.2.0) + public_suffix (6.0.1) rake (13.2.1) + rchardet (1.8.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.9) - strscan + rexml (3.3.9) rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) + securerandom (0.4.0) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -187,7 +217,7 @@ GEM simctl (1.6.10) CFPropertyList naturally - strscan (3.1.0) + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -196,16 +226,19 @@ GEM tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) + uri (1.0.2) word_wrap (1.0.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) From 3cb6677d2fba6dcc50abafc57e6f3cbc58fad4c6 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 12:51:10 -0500 Subject: [PATCH 7/8] test --- ios/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 96af300d..0b2c62c0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -108,7 +108,7 @@ platform :ios do ) # build the app - gym( + build_ios_app( scheme: 'HackerNews', output_name: output_name, configuration: 'Release', From 90cc14d14bc290a388fd588e013f883f41405242 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Mon, 2 Dec 2024 13:15:31 -0500 Subject: [PATCH 8/8] fix team --- ios/HackerNews.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/HackerNews.xcodeproj/project.pbxproj b/ios/HackerNews.xcodeproj/project.pbxproj index d478c935..9c729c35 100644 --- a/ios/HackerNews.xcodeproj/project.pbxproj +++ b/ios/HackerNews.xcodeproj/project.pbxproj @@ -744,7 +744,7 @@ CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"HackerNews/Preview Content\""; - DEVELOPMENT_TEAM = LSPBG7SYXK; + DEVELOPMENT_TEAM = 62J2XHNK9T; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -787,7 +787,7 @@ CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"HackerNews/Preview Content\""; - DEVELOPMENT_TEAM = LSPBG7SYXK; + DEVELOPMENT_TEAM = 62J2XHNK9T; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO;