From c86dd3e66e66093b4a123369549cc4f23cfe4c9b Mon Sep 17 00:00:00 2001 From: Spencer Transier <17955542+spencertransier@users.noreply.github.com> Date: Thu, 21 Nov 2024 20:43:17 -0800 Subject: [PATCH] Remove Internal builds leftovers (#23803) --- Scripts/BuildPhases/GenerateCredentials.sh | 4 +- WordPress/WordPress.xcodeproj/project.pbxproj | 1165 +---------------- .../xcschemes/WordPress Internal.xcscheme | 115 -- config/Jetpack.internal.xcconfig | 4 - config/Version.internal.xcconfig | 2 - config/WordPress.alpha.xcconfig | 2 +- config/WordPress.debug.xcconfig | 2 +- config/WordPress.internal.xcconfig | 4 - fastlane/Fastfile | 68 +- fastlane/lanes/build.rb | 2 +- fastlane/lanes/codesign.rb | 26 - fastlane/lanes/release.rb | 43 +- 12 files changed, 77 insertions(+), 1360 deletions(-) delete mode 100644 WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Internal.xcscheme delete mode 100644 config/Jetpack.internal.xcconfig delete mode 100644 config/Version.internal.xcconfig delete mode 100644 config/WordPress.internal.xcconfig diff --git a/Scripts/BuildPhases/GenerateCredentials.sh b/Scripts/BuildPhases/GenerateCredentials.sh index 9b94b0deae4c..03ece027b089 100755 --- a/Scripts/BuildPhases/GenerateCredentials.sh +++ b/Scripts/BuildPhases/GenerateCredentials.sh @@ -116,8 +116,8 @@ EXTERNAL_CONTRIBUTOR_MSG="If you are an external contributor, run \`bundle exec case $CONFIGURATION in Release*) - # There are three release configurations: Release, Release-Alpha, and - # Release-Internal. Since they all start with "Release" we can use a + # There are two release configurations: Release and Release-Alpha. + # Since they all start with "Release", we can use a # pattern to check for them. echo "error: $COULD_NOT_FIND_SECRET_MSG. Cannot continue Release build. $INTERNAL_CONTRIBUTOR_MSG. $EXTERNAL_CONTRIBUTOR_RELEASE_MSG." exit 1 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index b27923adf735..1e59cf690b56 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -2158,7 +2158,6 @@ 2422A2BF2C5846DB00402A81 /* Blog+RestAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Blog+RestAPITests.swift"; sourceTree = ""; }; 24350E7C264DB76E009BB2B6 /* Jetpack.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Jetpack.debug.xcconfig; sourceTree = ""; }; 24351059264DC1E2009BB2B6 /* Jetpack.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Jetpack.release.xcconfig; sourceTree = ""; }; - 243511A4264DC2D9009BB2B6 /* Jetpack.internal.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Jetpack.internal.xcconfig; sourceTree = ""; }; 24351253264DCA08009BB2B6 /* Secrets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Secrets.swift; path = ../Secrets/Secrets.swift; sourceTree = BUILT_PRODUCTS_DIR; }; 2439B1DB264ECBDF00239130 /* Jetpack.alpha.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Jetpack.alpha.xcconfig; sourceTree = ""; }; 246D0A0225E97D5D0028B83F /* Blog+ObjcTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Blog+ObjcTests.m"; sourceTree = ""; }; @@ -3138,10 +3137,8 @@ F1482CDF2575BDA4007E4DD6 /* SitesDataProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SitesDataProvider.swift; sourceTree = ""; }; F14B5F70208E648200439554 /* WordPress.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPress.debug.xcconfig; sourceTree = ""; }; F14B5F71208E648200439554 /* WordPress.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPress.release.xcconfig; sourceTree = ""; }; - F14B5F72208E648300439554 /* WordPress.internal.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPress.internal.xcconfig; sourceTree = ""; }; F14B5F73208E648300439554 /* WordPress.alpha.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPress.alpha.xcconfig; sourceTree = ""; }; F14B5F74208E64F900439554 /* Version.public.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.public.xcconfig; sourceTree = ""; }; - F14B5F75208E64F900439554 /* Version.internal.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.internal.xcconfig; sourceTree = ""; }; F151EC822665271200AEA89E /* BloggingRemindersSchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BloggingRemindersSchedulerTests.swift; sourceTree = ""; }; F15D1FB9265C41A900854EE5 /* BloggingRemindersStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BloggingRemindersStoreTests.swift; sourceTree = ""; }; F17A2A1F23BFBD84001E96AC /* UIView+ExistingConstraints.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+ExistingConstraints.swift"; sourceTree = ""; }; @@ -7102,13 +7099,10 @@ 98FB6E9F23074CE5002DDC8D /* Common.xcconfig */, 3F9DD3F72CC2188400DF1760 /* Common.enterprise.xcconfig */, 3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */, - F14B5F75208E64F900439554 /* Version.internal.xcconfig */, F14B5F74208E64F900439554 /* Version.public.xcconfig */, F14B5F70208E648200439554 /* WordPress.debug.xcconfig */, F14B5F71208E648200439554 /* WordPress.release.xcconfig */, - F14B5F72208E648300439554 /* WordPress.internal.xcconfig */, 24350E7C264DB76E009BB2B6 /* Jetpack.debug.xcconfig */, - 243511A4264DC2D9009BB2B6 /* Jetpack.internal.xcconfig */, 24351059264DC1E2009BB2B6 /* Jetpack.release.xcconfig */, 2439B1DB264ECBDF00239130 /* Jetpack.alpha.xcconfig */, F14B5F73208E648300439554 /* WordPress.alpha.xcconfig */, @@ -10931,58 +10925,6 @@ }; name = Release; }; - 0107E0E828F97D5000DE87DB /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; - BUILD_SCHEME = Jetpack; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = "JetpackStatsWidgets/Supporting Files/JetpackStatsWidgetsRelease-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "COCOAPODS=1", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = JetpackStatsWidgets/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.jetpack.internal.JetpackStatsWidgets; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.internal.JetpackStatsWidgets"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_JETPACK; - SWIFT_OBJC_BRIDGING_HEADER = "JetpackStatsWidgets/Supporting Files/JetpackStatsWidgets-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = jpinternal; - }; - name = "Release-Internal"; - }; 0107E0E928F97D5000DE87DB /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -11133,56 +11075,6 @@ }; name = Release; }; - 0107E15228FE9DB200DE87DB /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUILD_SCHEME = Jetpack; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = "JetpackIntents/Supporting Files/JetpackIntentsRelease-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "COCOAPODS=1", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = JetpackIntents/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.jetpack.internal.JetpackIntents; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.internal.JetpackIntents"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_JETPACK; - SWIFT_OBJC_BRIDGING_HEADER = "JetpackIntents/Supporting Files/JetpackIntents-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = jpinternal; - }; - name = "Release-Internal"; - }; 0107E15328FE9DB200DE87DB /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -11251,15 +11143,6 @@ }; name = Release; }; - 096A92F826E2A00000448C68 /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Release-Internal"; - }; 096A92F926E2A00000448C68 /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -11419,14 +11302,6 @@ }; name = Release; }; - 3F47AC4B2A7206C000208F0D /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Release-Internal"; - }; 3F47AC4C2A7206C000208F0D /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -11542,57 +11417,6 @@ }; name = Release; }; - 4AD953CC2C21451800D0EEFA /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3F9DD3F82CC21E7B00DF1760 /* WordPressAuthenticator.enterprise.xcconfig */; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 WordPress. All rights reserved."; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.library.WordPressAuthenticator; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = "Release-Internal"; - }; 4AD953CD2C21451800D0EEFA /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = 3F9DD3F82CC21E7B00DF1760 /* WordPressAuthenticator.enterprise.xcconfig */; @@ -11720,41 +11544,6 @@ }; name = Release; }; - 4AD953D02C21451800D0EEFA /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 4A2F746A2C2198CB00E72117 /* WordPressAuthenticatorTests.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.library.WordPressAuthenticatorTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = "Release-Internal"; - }; 4AD953D12C21451800D0EEFA /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = 4A2F746A2C2198CB00E72117 /* WordPressAuthenticatorTests.xcconfig */; @@ -11883,52 +11672,6 @@ }; name = Release; }; - 733F36132126197800988727 /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = "WordPressNotificationContentExtension/WordPressNotificationContentExtension-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "COCOAPODS=1", - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "WordPressNotificationContentExtension/Info-Internal.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.internal.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.internal.WordPressNotificationContentExtension"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressNotificationContentExtension/Sources/WordPressNotificationContentExtension-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = wpinternal; - }; - name = "Release-Internal"; - }; 733F36142126197800988727 /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -12068,7 +11811,7 @@ }; name = Release; }; - 7358E6C2210BD318002323EB /* Release-Internal */ = { + 7358E6C3210BD318002323EB /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; @@ -12082,7 +11825,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/WordPressNotificationServiceExtension-Alpha.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -12095,89 +11838,43 @@ ); GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "WordPressNotificationServiceExtension/Info-Internal.plist"; + INFOPLIST_FILE = "WordPressNotificationServiceExtension/Info-Alpha.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.internal.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.alpha.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.internal.WordPressNotificationServiceExtension"; + PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.alpha.WordPressNotificationServiceExtension"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; SWIFT_OBJC_BRIDGING_HEADER = "WordPressNotificationServiceExtension/Sources/WordPressNotificationServiceExtension-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = wpinternal; + WPCOM_SCHEME = wpalpha; }; - name = "Release-Internal"; + name = "Release-Alpha"; }; - 7358E6C3210BD318002323EB /* Release-Alpha */ = { + 7457667D202B558C00F42E40 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 09F367D2BE684EDE2E4A40E3 /* Pods-WordPressDraftActionExtension.debug.xcconfig */; buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + APPLICATION_EXTENSION_API_ONLY = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = "extension-icon"; + CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = "WordPressNotificationServiceExtension/WordPressNotificationServiceExtension-Alpha.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "COCOAPODS=1", - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "WordPressNotificationServiceExtension/Info-Alpha.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.alpha.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.alpha.WordPressNotificationServiceExtension"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressNotificationServiceExtension/Sources/WordPressNotificationServiceExtension-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = wpalpha; - }; - name = "Release-Alpha"; - }; - 7457667D202B558C00F42E40 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 09F367D2BE684EDE2E4A40E3 /* Pods-WordPressDraftActionExtension.debug.xcconfig */; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = "extension-icon"; - CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = NO; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES; - CODE_SIGN_ENTITLEMENTS = WordPressDraftActionExtension/WordPressDraftActionExtension.entitlements; - CODE_SIGN_STYLE = Manual; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES; + CODE_SIGN_ENTITLEMENTS = WordPressDraftActionExtension/WordPressDraftActionExtension.entitlements; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -12265,59 +11962,6 @@ }; name = Release; }; - 7457667F202B558C00F42E40 /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = CDA9AED50FDA27959A5CD1B2 /* Pods-WordPressDraftActionExtension.release-internal.xcconfig */; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = "extension-icon"; - CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = NO; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES; - CODE_SIGN_ENTITLEMENTS = "WordPressDraftActionExtension/WordPressDraftActionExtension-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WordPressDraftActionExtension/WordPressDraftPrefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "WordPressDraftActionExtension/Info-Internal.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.internal.WordPressDraftAction; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "0bba6da4-494e-4f1b-b195-dd5f6e31c8b4"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.internal.WordPressDraftAction"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressDraftActionExtension/WordPressDraftActionExtension-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = wpinternal; - }; - name = "Release-Internal"; - }; 74576680202B558C00F42E40 /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = F75F3A68DCE524B4BAFCE76E /* Pods-WordPressDraftActionExtension.release-alpha.xcconfig */; @@ -12508,75 +12152,6 @@ }; name = Release; }; - 8096212128E540D700940A5D /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 293E283D7339E7B6D13F6E09 /* Pods-JetpackShareExtension.release-internal.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = ""; - BUILD_SCHEME = Jetpack; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_ENTITLEMENTS = "WordPressShareExtension/WordPressShare-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WordPressShareExtension/WordPressSharePrefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/Crashlytics\"", - "\"${PODS_ROOT}/Headers/Public/Fabric\"", - "\"${PODS_ROOT}/Headers/Public/GoogleSignIn\"", - "\"${PODS_ROOT}/Headers/Public/HockeySDK\"", - "\"$(SDKROOT)/usr/include/libxml2/\"", - ); - INFOPLIST_FILE = "JetpackShareExtension/Info-Internal.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D INTERNAL_BUILD"; - PRODUCT_BUNDLE_IDENTIFIER = com.jetpack.internal.JetpackShare; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.internal.JetpackShare"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_JETPACK; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressShareExtension/WordPressShare-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - WPCOM_SCHEME = jpinternal; - }; - name = "Release-Internal"; - }; 8096212228E540D700940A5D /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = C7AEA9D1F1AC3F501B6DE0C8 /* Pods-JetpackShareExtension.release-alpha.xcconfig */; @@ -12753,60 +12328,6 @@ }; name = Release; }; - 8096218328E55C9400940A5D /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5E48AA7F709A5B0F2318A7E3 /* Pods-JetpackDraftActionExtension.release-internal.xcconfig */; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = "jp-extension-icon"; - BUILD_SCHEME = Jetpack; - CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = NO; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES; - CODE_SIGN_ENTITLEMENTS = "WordPressDraftActionExtension/WordPressDraftActionExtension-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WordPressDraftActionExtension/WordPressDraftPrefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "JetpackDraftActionExtension/Info-Internal.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.jetpack.internal.JetpackDraftAction; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "0bba6da4-494e-4f1b-b195-dd5f6e31c8b4"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.internal.JetpackDraftAction"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_JETPACK; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressDraftActionExtension/WordPressDraftActionExtension-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = jpinternal; - }; - name = "Release-Internal"; - }; 8096218428E55C9400940A5D /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = C5E82422F47D9BF7E682262B /* Pods-JetpackDraftActionExtension.release-alpha.xcconfig */; @@ -12956,53 +12477,6 @@ }; name = Release; }; - 80F6D05228EE866A00953C1A /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUILD_SCHEME = Jetpack; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - 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_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "COCOAPODS=1", - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "JetpackNotificationServiceExtension/Info-Internal.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = "com.jetpack.internal.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.internal.$(PRODUCT_NAME:rfc1034identifier)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_JETPACK; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressNotificationServiceExtension/Sources/WordPressNotificationServiceExtension-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = jpinternal; - }; - name = "Release-Internal"; - }; 80F6D05328EE866A00953C1A /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -13144,49 +12618,6 @@ }; name = Release; }; - 8511CFBF1C607A7000B7CEED /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = WordPressScreenshotGeneration/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.WordPressScreenshotGeneration; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = WordPress; - USES_XCTRUNNER = YES; - }; - name = "Release-Internal"; - }; 8511CFC01C607A7000B7CEED /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -13532,297 +12963,73 @@ }; name = Release; }; - 932225B41C7CE50400443B02 /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C82B4C5ECF11C9FEE39CD9A0 /* Pods-WordPressShareExtension.release-internal.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = ""; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_ENTITLEMENTS = "WordPressShareExtension/WordPressShare-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WordPressShareExtension/WordPressSharePrefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/Crashlytics\"", - "\"${PODS_ROOT}/Headers/Public/Fabric\"", - "\"${PODS_ROOT}/Headers/Public/GoogleSignIn\"", - "\"${PODS_ROOT}/Headers/Public/HockeySDK\"", - "\"$(SDKROOT)/usr/include/libxml2/\"", - ); - INFOPLIST_FILE = "WordPressShareExtension/Info-Internal.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D INTERNAL_BUILD"; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.internal.WordPressShare; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.internal.WordPressShare"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressShareExtension/WordPressShare-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - WPCOM_SCHEME = wpinternal; - }; - name = "Release-Internal"; - }; 932225B51C7CE50400443B02 /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = 1BC96E982E9B1A6DD86AF491 /* Pods-WordPressShareExtension.release-alpha.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = ""; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_ENTITLEMENTS = "WordPressShareExtension/WordPressShare-Alpha.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = WordPressShareExtension/WordPressSharePrefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - ALPHA_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/Crashlytics\"", - "\"${PODS_ROOT}/Headers/Public/Fabric\"", - "\"${PODS_ROOT}/Headers/Public/GoogleSignIn\"", - "\"${PODS_ROOT}/Headers/Public/HockeySDK\"", - "\"$(SDKROOT)/usr/include/libxml2/\"", - ); - INFOPLIST_FILE = "WordPressShareExtension/Info-Alpha.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D ALPHA_BUILD -D INTERNAL_BUILD"; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.alpha.WordPressShare; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.alpha.WordPressShare"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressShareExtension/WordPressShare-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - WPCOM_SCHEME = wpalpha; - }; - name = "Release-Alpha"; - }; - 93DEAA9D182D567A004E34D1 /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = F14B5F72208E648300439554 /* WordPress.internal.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEFINES_MODULE = YES; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_THUMB_SUPPORT = NO; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_CFLAGS = ( - "-Wno-incomplete-umbrella", - "-Wno-format-security", - ); - OTHER_LDFLAGS = ( - "-lxml2", - "-licucore", - ); - PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 5.0; - VALIDATE_PRODUCT = YES; - WPCOM_CONFIG = "$(SRCROOT)/../.configure-files/wpcom_internal_app_credentials"; - }; - name = "Release-Internal"; - }; - 93DEAA9E182D567A004E34D1 /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = BBA98A42A5503D734AC9C936 /* Pods-Apps-WordPress.release-internal.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; - APPLICATION_EXTENSION_API_ONLY = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = "$(inherited)"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; - CODE_SIGN_ENTITLEMENTS = "WordPress-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - DEFINES_MODULE = YES; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_PREFIX_HEADER = WordPress_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_THUMB_SUPPORT = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /usr/include/libxml2, - ); - INFOPLIST_FILE = "WordPress-Internal-Info.plist"; - INFOPLIST_PREPROCESS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - JP_SCHEME = jpinternal; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = "$(VERSION_SHORT)"; - OTHER_CFLAGS = ( - "$(inherited)", - "-Wno-format-security", - "-Wno-format", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-l\"c++\"", - "-l\"iconv\"", - "-l\"sqlite3.0\"", - "-l\"z\"", - ); - OTHER_SWIFT_FLAGS = "$(inherited) -D INTERNAL_BUILD"; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.internal; - PRODUCT_NAME = WordPress; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.internal"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; - SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h"; - SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h"; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = wpinternal; - }; - name = "Release-Internal"; - }; - 93DEAAA0182D567A004E34D1 /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C9264D275F6288F66C33D2CE /* Pods-WordPressTest.release-internal.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WordPress.app/WordPress"; - CLANG_ENABLE_MODULES = "$(inherited)"; + APPLICATION_EXTENSION_API_ONLY = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = ""; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - COPY_PHASE_STRIP = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = "WordPressShareExtension/WordPressShare-Alpha.entitlements"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; + COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "WordPressTest/WordPressTest-Prefix.pch"; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_PREFIX_HEADER = WordPressShareExtension/WordPressSharePrefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + ALPHA_BUILD, + "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/Crashlytics\"", "\"${PODS_ROOT}/Headers/Public/Fabric\"", + "\"${PODS_ROOT}/Headers/Public/GoogleSignIn\"", "\"${PODS_ROOT}/Headers/Public/HockeySDK\"", - "$(SDKROOT)/usr/include/libxml2", - "$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources", + "\"$(SDKROOT)/usr/include/libxml2/\"", ); - INFOPLIST_FILE = "WordPressTest/WordPressTest-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.${PRODUCT_NAME:rfc1034identifier}"; + INFOPLIST_FILE = "WordPressShareExtension/Info-Alpha.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D ALPHA_BUILD -D INTERNAL_BUILD"; + PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.alpha.WordPressShare; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressTest/WordPressTest-Bridging-Header.h"; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; + PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.alpha.WordPressShare"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_WORDPRESS; + SWIFT_OBJC_BRIDGING_HEADER = "WordPressShareExtension/WordPressShare-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUNDLE_LOADER)"; + WPCOM_SCHEME = wpalpha; }; - name = "Release-Internal"; + name = "Release-Alpha"; }; A2795808198819DE0031C6A3 /* Debug */ = { isa = XCBuildConfiguration; @@ -13844,16 +13051,6 @@ }; name = Release; }; - A279580A198819DE0031C6A3 /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = YES; - GCC_GENERATE_TEST_COVERAGE_FILES = NO; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Release-Internal"; - }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = F14B5F70208E648200439554 /* WordPress.debug.xcconfig */; @@ -14137,49 +13334,6 @@ }; name = Release; }; - EA14534029AD874C001F3143 /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "UITests/JetpackUITests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.jetpack.JetpackUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = Jetpack; - }; - name = "Release-Internal"; - }; EA14534129AD874C001F3143 /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -14358,72 +13512,6 @@ }; name = Release; }; - FABB26502602FC2C00C8785C /* Release-Internal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 243511A4264DC2D9009BB2B6 /* Jetpack.internal.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; - APPLICATION_EXTENSION_API_ONLY = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = "$(inherited)"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; - CODE_SIGN_ENTITLEMENTS = "Jetpack/JetpackRelease-Internal.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = "${VERSION_LONG}"; - DEFINES_MODULE = YES; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - GCC_PREFIX_HEADER = WordPress_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - INTERNAL_BUILD, - "WPCOM_SCHEME=\\@\\\"${WPCOM_SCHEME}\\\"", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_THUMB_SUPPORT = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - /usr/include/libxml2, - ); - INFOPLIST_FILE = Jetpack/Info.plist; - INFOPLIST_PREPROCESS = YES; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = "${VERSION_SHORT}"; - OTHER_CFLAGS = ( - "$(inherited)", - "-Wno-format-security", - "-Wno-format", - ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-l\"c++\"", - "-l\"iconv\"", - "-l\"sqlite3.0\"", - "-l\"z\"", - ); - OTHER_SWIFT_FLAGS = "$(inherited) -D INTERNAL_BUILD"; - PRODUCT_BUNDLE_IDENTIFIER = com.jetpack.internal; - PRODUCT_MODULE_NAME = WordPress; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.internal"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = IS_JETPACK; - SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h"; - SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h"; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - WPCOM_SCHEME = jpinternal; - }; - name = "Release-Internal"; - }; FABB26512602FC2C00C8785C /* Release-Alpha */ = { isa = XCBuildConfiguration; baseConfigurationReference = 2439B1DB264ECBDF00239130 /* Jetpack.alpha.xcconfig */; @@ -14586,50 +13674,6 @@ }; name = Release; }; - FAF64BA02637DEEC00E8A1DF /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = JetpackScreenshotGeneration/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = com.jetpack.JetpackScreenshotGeneration; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = Jetpack; - USES_XCTRUNNER = YES; - }; - name = "Release-Internal"; - }; FAF64BA12637DEEC00E8A1DF /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -14769,49 +13813,6 @@ }; name = Release; }; - FF2716981CAAC87B0006E2D4 /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - INFOPLIST_FILE = "UITests/WordPressUITests-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = org.wordpress.WordPressUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = WordPress; - }; - name = "Release-Internal"; - }; FF2716991CAAC87B0006E2D4 /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -14873,15 +13874,6 @@ }; name = Release; }; - FFA8E22D1F94E3DE0002170F /* Release-Internal */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Release-Internal"; - }; FFA8E22E1F94E3DE0002170F /* Release-Alpha */ = { isa = XCBuildConfiguration; buildSettings = { @@ -14899,7 +13891,6 @@ buildConfigurations = ( 0107E0E628F97D5000DE87DB /* Debug */, 0107E0E728F97D5000DE87DB /* Release */, - 0107E0E828F97D5000DE87DB /* Release-Internal */, 0107E0E928F97D5000DE87DB /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14910,7 +13901,6 @@ buildConfigurations = ( 0107E15028FE9DB200DE87DB /* Debug */, 0107E15128FE9DB200DE87DB /* Release */, - 0107E15228FE9DB200DE87DB /* Release-Internal */, 0107E15328FE9DB200DE87DB /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14921,7 +13911,6 @@ buildConfigurations = ( 096A92F626E2A00000448C68 /* Debug */, 096A92F726E2A00000448C68 /* Release */, - 096A92F826E2A00000448C68 /* Release-Internal */, 096A92F926E2A00000448C68 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14932,7 +13921,6 @@ buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Debug */, 1D6058950D05DD3E006BFB54 /* Release */, - 93DEAA9E182D567A004E34D1 /* Release-Internal */, 8546B4441BEAD39700193C07 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14943,7 +13931,6 @@ buildConfigurations = ( 3F47AC492A7206C000208F0D /* Debug */, 3F47AC4A2A7206C000208F0D /* Release */, - 3F47AC4B2A7206C000208F0D /* Release-Internal */, 3F47AC4C2A7206C000208F0D /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14954,7 +13941,6 @@ buildConfigurations = ( 4AD953CA2C21451800D0EEFA /* Debug */, 4AD953CB2C21451800D0EEFA /* Release */, - 4AD953CC2C21451800D0EEFA /* Release-Internal */, 4AD953CD2C21451800D0EEFA /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14965,7 +13951,6 @@ buildConfigurations = ( 4AD953CE2C21451800D0EEFA /* Debug */, 4AD953CF2C21451800D0EEFA /* Release */, - 4AD953D02C21451800D0EEFA /* Release-Internal */, 4AD953D12C21451800D0EEFA /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14976,7 +13961,6 @@ buildConfigurations = ( 733F36112126197800988727 /* Debug */, 733F36122126197800988727 /* Release */, - 733F36132126197800988727 /* Release-Internal */, 733F36142126197800988727 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14987,7 +13971,6 @@ buildConfigurations = ( 7358E6C0210BD318002323EB /* Debug */, 7358E6C1210BD318002323EB /* Release */, - 7358E6C2210BD318002323EB /* Release-Internal */, 7358E6C3210BD318002323EB /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -14998,7 +13981,6 @@ buildConfigurations = ( 7457667D202B558C00F42E40 /* Debug */, 7457667E202B558C00F42E40 /* Release */, - 7457667F202B558C00F42E40 /* Release-Internal */, 74576680202B558C00F42E40 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15009,7 +13991,6 @@ buildConfigurations = ( 8096211F28E540D700940A5D /* Debug */, 8096212028E540D700940A5D /* Release */, - 8096212128E540D700940A5D /* Release-Internal */, 8096212228E540D700940A5D /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15020,7 +14001,6 @@ buildConfigurations = ( 8096218128E55C9400940A5D /* Debug */, 8096218228E55C9400940A5D /* Release */, - 8096218328E55C9400940A5D /* Release-Internal */, 8096218428E55C9400940A5D /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15031,7 +14011,6 @@ buildConfigurations = ( 80F6D05028EE866A00953C1A /* Debug */, 80F6D05128EE866A00953C1A /* Release */, - 80F6D05228EE866A00953C1A /* Release-Internal */, 80F6D05328EE866A00953C1A /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15042,7 +14021,6 @@ buildConfigurations = ( 8511CFBD1C607A7000B7CEED /* Debug */, 8511CFBE1C607A7000B7CEED /* Release */, - 8511CFBF1C607A7000B7CEED /* Release-Internal */, 8511CFC01C607A7000B7CEED /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15053,7 +14031,6 @@ buildConfigurations = ( 932225B21C7CE50400443B02 /* Debug */, 932225B31C7CE50400443B02 /* Release */, - 932225B41C7CE50400443B02 /* Release-Internal */, 932225B51C7CE50400443B02 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15064,7 +14041,6 @@ buildConfigurations = ( A2795808198819DE0031C6A3 /* Debug */, A2795809198819DE0031C6A3 /* Release */, - A279580A198819DE0031C6A3 /* Release-Internal */, 8546B4461BEAD39700193C07 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15075,7 +14051,6 @@ buildConfigurations = ( C01FCF4F08A954540054247B /* Debug */, C01FCF5008A954540054247B /* Release */, - 93DEAA9D182D567A004E34D1 /* Release-Internal */, 8546B4431BEAD39700193C07 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15086,7 +14061,6 @@ buildConfigurations = ( E16AB93914D978240047A2E5 /* Debug */, E16AB93A14D978240047A2E5 /* Release */, - 93DEAAA0182D567A004E34D1 /* Release-Internal */, 8546B4451BEAD39700193C07 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15097,7 +14071,6 @@ buildConfigurations = ( EA14533E29AD874C001F3143 /* Debug */, EA14533F29AD874C001F3143 /* Release */, - EA14534029AD874C001F3143 /* Release-Internal */, EA14534129AD874C001F3143 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15108,7 +14081,6 @@ buildConfigurations = ( FABB264E2602FC2C00C8785C /* Debug */, FABB264F2602FC2C00C8785C /* Release */, - FABB26502602FC2C00C8785C /* Release-Internal */, FABB26512602FC2C00C8785C /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15119,7 +14091,6 @@ buildConfigurations = ( FAF64B9E2637DEEC00E8A1DF /* Debug */, FAF64B9F2637DEEC00E8A1DF /* Release */, - FAF64BA02637DEEC00E8A1DF /* Release-Internal */, FAF64BA12637DEEC00E8A1DF /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15130,7 +14101,6 @@ buildConfigurations = ( FF2716961CAAC87B0006E2D4 /* Debug */, FF2716971CAAC87B0006E2D4 /* Release */, - FF2716981CAAC87B0006E2D4 /* Release-Internal */, FF2716991CAAC87B0006E2D4 /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; @@ -15141,7 +14111,6 @@ buildConfigurations = ( FFA8E22B1F94E3DE0002170F /* Debug */, FFA8E22C1F94E3DE0002170F /* Release */, - FFA8E22D1F94E3DE0002170F /* Release-Internal */, FFA8E22E1F94E3DE0002170F /* Release-Alpha */, ); defaultConfigurationIsVisible = 0; diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Internal.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Internal.xcscheme deleted file mode 100644 index 66e5bce0281c..000000000000 --- a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPress Internal.xcscheme +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/Jetpack.internal.xcconfig b/config/Jetpack.internal.xcconfig deleted file mode 100644 index 483236e8c0d1..000000000000 --- a/config/Jetpack.internal.xcconfig +++ /dev/null @@ -1,4 +0,0 @@ -#include "../Pods/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack.release-internal.xcconfig" -#include "Common.enterprise.xcconfig" - -BUILD_SCHEME=Jetpack diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig deleted file mode 100644 index 18d526be4fd7..000000000000 --- a/config/Version.internal.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -VERSION_LONG = 25.4.2.20241030 -VERSION_SHORT = 25.4.2 diff --git a/config/WordPress.alpha.xcconfig b/config/WordPress.alpha.xcconfig index 9319acc1f4f9..4014f73dc271 100644 --- a/config/WordPress.alpha.xcconfig +++ b/config/WordPress.alpha.xcconfig @@ -1,4 +1,4 @@ -#include "Version.internal.xcconfig" +#include "Version.public.xcconfig" #include "Common.enterprise.xcconfig" BUILD_SCHEME=WordPress Alpha diff --git a/config/WordPress.debug.xcconfig b/config/WordPress.debug.xcconfig index a1db3a1aaba0..9b9b00d08473 100644 --- a/config/WordPress.debug.xcconfig +++ b/config/WordPress.debug.xcconfig @@ -1,4 +1,4 @@ -#include "Version.internal.xcconfig" +#include "Version.public.xcconfig" #include "Common.debug.xcconfig" BUILD_SCHEME=WordPress diff --git a/config/WordPress.internal.xcconfig b/config/WordPress.internal.xcconfig deleted file mode 100644 index 7472e4f895f3..000000000000 --- a/config/WordPress.internal.xcconfig +++ /dev/null @@ -1,4 +0,0 @@ -#include "Version.internal.xcconfig" -#include "Common.enterprise.xcconfig" - -BUILD_SCHEME=WordPress Internal diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b143e06e48fb..ac6314701ef0 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -51,7 +51,6 @@ 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') ENV['FASTLANE_WWDR_USE_HTTP1_AND_RETRIES'] = 'true' # Fastlane's `git_branch` action and its relevant helpers use environment variables to modify the output. @@ -66,10 +65,6 @@ VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionForm BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new PUBLIC_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: PUBLIC_CONFIG_FILE) -# Instantiate internal versioning classes -INTERNAL_BUILD_CODE_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::DateBuildCodeCalculator.new -INTERNAL_VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: INTERNAL_CONFIG_FILE) - BUILDKITE_ORGANIZATION = 'automattic' BUILDKITE_PIPELINE = 'wordpress-ios' BUILDKITE_RELEASE_PIPELINE = 'release-builds.yml' @@ -107,15 +102,6 @@ def release_version_current VERSION_FORMATTER.release_version(current_version) end -# Returns the internal release version of the app in the format `1.2` or `1.2.3` if it is a hotfix -# -def release_version_current_internal - # Read the current release version from the .xcconfig file and parse it into an AppVersion object - current_version = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version) - # Return the formatted release version - VERSION_FORMATTER.release_version(current_version) -end - # Returns the next release version of the app in the format `1.2` or `1.2.3` if it is a hotfix # def release_version_next @@ -145,45 +131,19 @@ def build_code_current BUILD_CODE_FORMATTER.build_code(version: version) end -# Returns the current internal build code of the app -# -def build_code_current_internal - # Read the current build code from the .xcconfig file and parse it into an AppVersion object - # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version - # calculator can be used to calculate the next four-part version - version = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG')) - # Return the formatted build code - BUILD_CODE_FORMATTER.build_code(version: version) -end - # Returns the build code of the app for the code freeze. It is the release version name plus sets the build number to 0 # def build_code_code_freeze # Read the current build code from the .xcconfig file and parse it into an AppVersion object # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version # calculator can be used to calculate the next four-part version - release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version) + release_version_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version) # Calculate the next release version, which will be used as the basis of the new build code build_code_code_freeze = VERSION_CALCULATOR.next_release_version(version: release_version_current) # Return the formatted build code BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze) end -# Returns the internal build code of the app for the code freeze. It is the release version name plus sets the build -# number to 0 -# -def build_code_code_freeze_internal - # Read the current build code from the .xcconfig file and parse it into an AppVersion object - # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version - # calculator can be used to calculate the next four-part version - release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version) - # Calculate the next release version, which will be used as the basis of the new build code - release_version_next = VERSION_CALCULATOR.next_release_version(version: release_version_current) - build_code_code_freeze = INTERNAL_BUILD_CODE_CALCULATOR.next_build_code(version: release_version_next) - # Return the formatted build code - BUILD_CODE_FORMATTER.build_code(version: build_code_code_freeze) -end - # Returns the build code of the app for the code freeze. It is the hotfix version name plus sets the build number to 0 # def build_code_hotfix(release_version:) @@ -205,32 +165,6 @@ def build_code_next BUILD_CODE_FORMATTER.build_code(version: build_code_next) end -# Returns the next internal build code of the app -# -def build_code_next_internal - # Read the current build code from the .xcconfig file and parse it into an AppVersion object - # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version - # calculator can be used to calculate the next four-part version - build_code_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_build_code(attribute_name: 'VERSION_LONG')) - # Calculate the next build code - build_code_next = INTERNAL_BUILD_CODE_CALCULATOR.next_build_code(version: build_code_current) - # Return the formatted build code - BUILD_CODE_FORMATTER.build_code(version: build_code_next) -end - -# Returns the next internal hotfix build code of the app -# -def build_code_hotfix_internal(release_version:) - # Read the current build code from the .xcconfig file and parse it into an AppVersion object - # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version - # calculator can be used to calculate the next four-part version - build_code_current = VERSION_FORMATTER.parse(release_version) - # Calculate the next build code - build_code_next = INTERNAL_BUILD_CODE_CALCULATOR.next_build_code(version: build_code_current) - # Return the formatted build code - BUILD_CODE_FORMATTER.build_code(version: build_code_next) -end - ######################################################################## # Group buildkite logs by action ######################################################################## diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb index e79816f0d97b..b52d2f2ea80f 100644 --- a/fastlane/lanes/build.rb +++ b/fastlane/lanes/build.rb @@ -359,7 +359,7 @@ 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') + version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig') versions = Xcodeproj::Config.new(File.new(version_config_path)).to_hash build_number = generate_prototype_build_number UI.message("Updating build version to #{build_number}") diff --git a/fastlane/lanes/codesign.rb b/fastlane/lanes/codesign.rb index d6749365bfc2..dca04665bf02 100644 --- a/fastlane/lanes/codesign.rb +++ b/fastlane/lanes/codesign.rb @@ -20,7 +20,6 @@ # lane :update_wordpress_certs_and_profiles do |options| alpha_code_signing(options) - internal_code_signing(options) appstore_code_signing(options) end @@ -31,7 +30,6 @@ # lane :update_jetpack_certs_and_profiles do |options| jetpack_alpha_code_signing(options) - jetpack_internal_code_signing(options) jetpack_appstore_code_signing(options) end @@ -51,18 +49,6 @@ ) end - # Downloads all the required certificates and profiles (using `match``) for the WordPress Internal builds (`org.wordpress.internal`) in the Enterprise account. - # Optionally, it can create any new necessary certificate or profile. - # - # @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones. - # - private_lane :internal_code_signing do |options| - update_code_signing_enterprise( - app_identifiers: ALL_WORDPRESS_BUNDLE_IDENTIFIERS.map { |id| id.sub(WORDPRESS_BUNDLE_IDENTIFIER, 'org.wordpress.internal') }, - readonly: options.fetch(:readonly, true) - ) - end - # Downloads all the required certificates and profiles (using `match``) for the WordPress App Store builds # Optionally, it can create any new necessary certificate or profile. # @@ -87,18 +73,6 @@ ) end - # Downloads all the required certificates and profiles (using `match``) for the Jetpack Internal builds (`com.jetpack.internal`) in the Enterprise account. - # Optionally, it can create any new necessary certificate or profile. - # - # @option [Boolean] readonly (default: true) Whether to only fetch existing certificates and profiles, without generating new ones. - # - private_lane :jetpack_internal_code_signing do |options| - update_code_signing_enterprise( - app_identifiers: ALL_JETPACK_BUNDLE_IDENTIFIERS.map { |id| id.sub(JETPACK_BUNDLE_IDENTIFIER, 'com.jetpack.internal') }, - readonly: options.fetch(:readonly, true) - ) - end - # Downloads all the required certificates and profiles (using `match``) for the Jetpack App Store builds. # Optionally, it can create any new necessary certificate or profile. # diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb index 335b0b936df0..e838543eb1fe 100644 --- a/fastlane/lanes/release.rb +++ b/fastlane/lanes/release.rb @@ -35,9 +35,6 @@ • Current release version and build code: #{release_version_current} (#{build_code_current}). • New release version and build code: #{release_version_next} (#{build_code_code_freeze}). - - • Current internal release version and build code: #{release_version_current_internal} (#{build_code_current_internal}) - • New internal release version and build code: #{release_version_next} (#{build_code_code_freeze_internal}) MESSAGE UI.important(message) @@ -58,16 +55,6 @@ ) UI.success "Done! New Release Version: #{release_version_current}. New Build Code: #{build_code_current}" - # Bump the internal release version and build code and write it to the `xcconfig` file - UI.message 'Bumping internal release version and build code...' - INTERNAL_VERSION_FILE.write( - # The external and internal release versions are always the same. Because the external release version was - # already bumped, we want to just use the `release_version_current` - version_short: release_version_current, - version_long: build_code_code_freeze_internal - ) - UI.success "Done! New Internal Release Version: #{release_version_current_internal}. New Internal Build Code: #{build_code_current_internal}" - commit_version_and_build_files new_version = release_version_current @@ -220,9 +207,6 @@ message = <<~MESSAGE • Current build code: #{build_code_current} • New build code: #{build_code_next} - - • Current internal build code: #{build_code_current_internal} - • New internal build code: #{build_code_next_internal} MESSAGE UI.important(message) @@ -235,7 +219,7 @@ download_localized_strings_and_metadata lint_localizations(allow_retry: skip_user_confirmation == false) - bump_build_codes + bump_build_code unless skip_user_confirmation || UI.confirm('Ready to push changes to remote and trigger the beta build?') UI.message("Terminating as requested. Don't forget to run the remainder of this automation manually.") @@ -293,7 +277,6 @@ new_version = options[:version] || UI.input('Version number for the new hotfix?') build_code_hotfix = build_code_hotfix(release_version: new_version) - build_code_hotfix_internal = build_code_hotfix_internal(release_version: new_version) # Parse the provided version into an AppVersion object parsed_version = VERSION_FORMATTER.parse(new_version) @@ -306,9 +289,6 @@ • Current release version and build code: #{release_version_current} (#{build_code_current}). • New release version and build code: #{new_version} (#{build_code_hotfix}). - • Current internal release version and build code: #{release_version_current_internal} (#{build_code_current_internal}). - • New internal release version and build code: #{new_version} (#{build_code_hotfix_internal}). - Branching from tag: #{previous_version} MESSAGE @@ -332,14 +312,6 @@ ) UI.success "Done! New Release Version: #{release_version_current}. New Build Code: #{build_code_current}" - # Bump the internal hotfix version and build code and write it to the `xcconfig` file - UI.message 'Bumping internal hotfix version and build code...' - INTERNAL_VERSION_FILE.write( - version_short: new_version, - version_long: build_code_hotfix_internal - ) - UI.success "Done! New Internal Release Version: #{release_version_current_internal}. New Internal Build Code: #{build_code_current_internal}" - commit_version_and_build_files unless options[:skip_confirm] || UI.confirm('Ready to push changes to remote?') @@ -405,7 +377,7 @@ download_localized_strings_and_metadata lint_localizations(allow_retry: skip_confirm == false) - bump_build_codes + bump_build_code unless skip_confirm || UI.confirm('Ready to push changes to remote and trigger the release build?') UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") @@ -598,9 +570,8 @@ def prompt_for_confirmation(message:, bypass:) UI.confirm(message) end -def bump_build_codes +def bump_build_code bump_production_build_code - bump_internal_build_code commit_version_and_build_files end @@ -610,15 +581,9 @@ def bump_production_build_code UI.success "Done. New Build Code: #{build_code_current}" end -def bump_internal_build_code - UI.message 'Bumping internal build code...' - INTERNAL_VERSION_FILE.write(version_long: build_code_next_internal) - UI.success "Done. New Internal Build Code: #{build_code_current_internal}" -end - def commit_version_and_build_files git_commit( - path: [PUBLIC_CONFIG_FILE, INTERNAL_CONFIG_FILE], + path: PUBLIC_CONFIG_FILE, message: 'Bump version number', allow_nothing_to_commit: false )