From f64aad399d360e64565c82566f4bde3096126325 Mon Sep 17 00:00:00 2001 From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:38:50 -0600 Subject: [PATCH] Fix pathing --- .buildkite/pipeline.yml | 2 +- Podfile | 2 +- Podfile.lock | 2 +- WordPress/WordPress.xcodeproj/project.pbxproj | 28 ++++++++----------- fastlane/Fastfile | 4 +-- fastlane/lanes/build.rb | 5 ++-- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 84e3bbe5c49a..b7fa09b620a4 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -113,7 +113,7 @@ steps: queue: "linter" - label: "🧹 Lint Translations" - command: "gplint /workdir/WordPress/Resources/AppStoreStrings.po" + command: "gplint /workdir/WordPress/WordPress/Resources/AppStoreStrings.po" plugins: - docker#v3.8.0: image: "public.ecr.aws/automattic/glotpress-validator:1.0.0" diff --git a/Podfile b/Podfile index dad355a77816..89d70d0450b4 100644 --- a/Podfile +++ b/Podfile @@ -11,7 +11,7 @@ source 'https://cdn.cocoapods.org/' raise 'Please run CocoaPods via `bundle exec`' unless %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE].any? { |k| ENV.key?(k) } -VERSION_XCCONFIG_PATH = File.join(File.expand_path(__dir__), 'config', 'Common.xcconfig') +VERSION_XCCONFIG_PATH = File.join(File.expand_path(__dir__), 'WordPress', 'Config', 'Common.xcconfig') APP_IOS_DEPLOYMENT_TARGET = Gem::Version.new(Xcodeproj::Config.new(VERSION_XCCONFIG_PATH).to_hash['IPHONEOS_DEPLOYMENT_TARGET']) platform :ios, APP_IOS_DEPLOYMENT_TARGET.version diff --git a/Podfile.lock b/Podfile.lock index 94d1e0ed5593..bc504bbdfea1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -27,6 +27,6 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1 WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c -PODFILE CHECKSUM: 99aff5ecb96391804fd8f28b29fd4e350ecd4b2e +PODFILE CHECKSUM: 1e0680605a463116265bb3ccf558739d3ae62a0a COCOAPODS: 1.16.1 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index f346c1ad952b..e44ae27278ea 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -5717,7 +5717,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = WordPressNotificationServiceExtension/WordPressNotificationServiceExtension.entitlements; + CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/Supporting Files/WordPressNotificationServiceExtension.entitlements"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; @@ -5765,7 +5765,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = WordPressNotificationServiceExtension/WordPressNotificationServiceExtension.entitlements; + CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/Supporting Files/WordPressNotificationServiceExtension.entitlements"; CODE_SIGN_IDENTITY = "Apple Distribution: Automattic, Inc. (PZYM8XX95Q)"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -5812,7 +5812,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/WordPressNotificationServiceExtension-Internal.entitlements"; + CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/Supporting Files/WordPressNotificationServiceExtension-Internal.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -5859,7 +5859,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/WordPressNotificationServiceExtension-Alpha.entitlements"; + CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/Supporting Files/WordPressNotificationServiceExtension-Alpha.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -6220,7 +6220,7 @@ INFOPLIST_FILE = "WordPressTest/WordPressTest-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/WordPressTest-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/Supporting Files/WordPressTest-Bridging-Header.h"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -6655,7 +6655,7 @@ INFOPLIST_FILE = "WordPressTest/WordPressTest-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/WordPressTest-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/Supporting Files/WordPressTest-Bridging-Header.h"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -6838,7 +6838,7 @@ INFOPLIST_FILE = "WordPressTest/WordPressTest-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/WordPressTest-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/Supporting Files/WordPressTest-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; SWIFT_VERSION = 5.0; @@ -6871,7 +6871,7 @@ INFOPLIST_FILE = "WordPressTest/WordPressTest-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/WordPressTest-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/Supporting Files/WordPressTest-Bridging-Header.h"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUNDLE_LOADER)"; @@ -7056,8 +7056,7 @@ }; FABB264E2602FC2C00C8785C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReferenceAnchor = 24F694542CD4075000AAB1A3 /* Config */; - baseConfigurationReferenceRelativePath = Jetpack.debug.xcconfig; + baseConfigurationReference = 152F25D5C232985E30F56CAC /* Pods-Apps-Jetpack.debug.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -7125,8 +7124,7 @@ }; FABB264F2602FC2C00C8785C /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReferenceAnchor = 24F694542CD4075000AAB1A3 /* Config */; - baseConfigurationReferenceRelativePath = Jetpack.release.xcconfig; + baseConfigurationReference = 011A2815DB0DE7E3973CBC0E /* Pods-Apps-Jetpack.release.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -7191,8 +7189,7 @@ }; FABB26502602FC2C00C8785C /* Release-Internal */ = { isa = XCBuildConfiguration; - baseConfigurationReferenceAnchor = 24F694542CD4075000AAB1A3 /* Config */; - baseConfigurationReferenceRelativePath = Jetpack.internal.xcconfig; + baseConfigurationReference = 67832AB9D81652460A80BE66 /* Pods-Apps-Jetpack.release-internal.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -7257,8 +7254,7 @@ }; FABB26512602FC2C00C8785C /* Release-Alpha */ = { isa = XCBuildConfiguration; - baseConfigurationReferenceAnchor = 24F694542CD4075000AAB1A3 /* Config */; - baseConfigurationReferenceRelativePath = Jetpack.alpha.xcconfig; + baseConfigurationReference = 150B6590614A28DF9AD25491 /* Pods-Apps-Jetpack.release-alpha.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b6b9941c845c..1230eeb1fc91 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -50,8 +50,8 @@ Dotenv.load(USER_ENV_FILE_PATH) Dotenv.load(PROJECT_ENV_FILE_PATH) GITHUB_REPO = 'wordpress-mobile/wordpress-iOS' DEFAULT_BRANCH = 'trunk' -PUBLIC_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig') -INTERNAL_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.internal.xcconfig') +PUBLIC_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Config', 'Version.public.xcconfig') +INTERNAL_CONFIG_FILE = File.join(PROJECT_ROOT_FOLDER, 'WordPress', 'Config', 'Version.internal.xcconfig') ENV['FASTLANE_WWDR_USE_HTTP1_AND_RETRIES'] = 'true' # Fastlane's `git_branch` action and its relevant helpers use environment variables to modify the output. diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb index e79816f0d97b..e56519c44e5e 100644 --- a/fastlane/lanes/build.rb +++ b/fastlane/lanes/build.rb @@ -359,13 +359,12 @@ def build_and_upload_prototype_build(scheme:, output_app_name:, appcenter_app_na configuration = 'Release-Alpha' # Get the current build version, and update it if needed - version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.internal.xcconfig') - versions = Xcodeproj::Config.new(File.new(version_config_path)).to_hash + versions = Xcodeproj::Config.new(File.new(INTERNAL_CONFIG_FILE)).to_hash build_number = generate_prototype_build_number UI.message("Updating build version to #{build_number}") versions['VERSION_LONG'] = build_number new_config = Xcodeproj::Config.new(versions) - new_config.save_as(Pathname.new(version_config_path)) + new_config.save_as(Pathname.new(INTERNAL_CONFIG_FILE)) # Build build_app(