Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify xcconfig #24280

Closed
wants to merge 3 commits into from
Closed

Simplify xcconfig #24280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af8a0ae
Simplify xcconfig
kean Mar 21, 2025
aac9013
Remove unused WordPressKit.xcconfig
kean Mar 21, 2025
4017aa2
Remove duplicated xcconfig values
kean Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions WordPress/WordPress.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2076,8 +2076,6 @@
3F8B45AA292C42CC00730FA4 /* MigrationSuccessCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationSuccessCell.swift; sourceTree = "<group>"; };
3F8EEC4D25B4817000EC9DAE /* StatsWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsWidgets.swift; sourceTree = "<group>"; };
3F8EEC6F25B4849A00EC9DAE /* SiteListProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteListProvider.swift; sourceTree = "<group>"; };
3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.debug.xcconfig; sourceTree = "<group>"; };
3F9DD3F72CC2188400DF1760 /* Common.enterprise.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.enterprise.xcconfig; sourceTree = "<group>"; };
3F9DD3F82CC21E7B00DF1760 /* WordPressAuthenticator.enterprise.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WordPressAuthenticator.enterprise.xcconfig; sourceTree = "<group>"; };
3FA59B99258289E30073772F /* StatsValueView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsValueView.swift; sourceTree = "<group>"; };
3FA640652670CEFE0064401E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
Expand Down Expand Up @@ -2149,8 +2147,6 @@
4A76A4BE29D4F0A500AABF4B /* reader-post-comments-success.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "reader-post-comments-success.json"; sourceTree = "<group>"; };
4A76F9102CE207FA0025F7FA /* UserListViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserListViewModelTests.swift; sourceTree = "<group>"; };
4A9314DB297790C300360232 /* PeopleServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeopleServiceTests.swift; sourceTree = "<group>"; };
4A98A9022C2274E100A2CE58 /* WordPressKitTests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WordPressKitTests.xcconfig; sourceTree = "<group>"; };
4A98A9032C2274E100A2CE58 /* WordPressKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WordPressKit.xcconfig; sourceTree = "<group>"; };
4A9948E129714EF1006282A9 /* AccountSettingsServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSettingsServiceTests.swift; sourceTree = "<group>"; };
4AA7EE0E2ADF7367007D261D /* PostRepositoryPostsListTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostRepositoryPostsListTests.swift; sourceTree = "<group>"; };
4AAD69072A6F68A5007FE77E /* MediaRepositoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaRepositoryTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6285,8 +6281,6 @@
isa = PBXGroup;
children = (
98FB6E9F23074CE5002DDC8D /* Common.xcconfig */,
3F9DD3F72CC2188400DF1760 /* Common.enterprise.xcconfig */,
3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */,
F14B5F74208E64F900439554 /* Version.public.xcconfig */,
F14B5F70208E648200439554 /* WordPress.debug.xcconfig */,
F14B5F71208E648200439554 /* WordPress.release.xcconfig */,
Expand All @@ -6297,8 +6291,6 @@
4AD955572C2155B300D0EEFA /* WordPressAuthenticator.xcconfig */,
3F9DD3F82CC21E7B00DF1760 /* WordPressAuthenticator.enterprise.xcconfig */,
4A2F746A2C2198CB00E72117 /* WordPressAuthenticatorTests.xcconfig */,
4A98A9032C2274E100A2CE58 /* WordPressKit.xcconfig */,
4A98A9022C2274E100A2CE58 /* WordPressKitTests.xcconfig */,
);
name = config;
path = ../config;
Expand Down
3 changes: 0 additions & 3 deletions config/Common.debug.xcconfig
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions config/Common.enterprise.xcconfig
View file
Open in desktop

This file was deleted.

26 changes: 23 additions & 3 deletions config/Common.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
// Shared

Comment on lines +1 to +2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: It's sort of implied that these are shared settings given we're in "common".

Suggested change
// Shared

But okay to leave it if you want homogeneous separation headings.

GCC_WARN_UNUSED_PARAMETER = YES
WARNING_CFLAGS = -Wno-nullability-completeness
IPHONEOS_DEPLOYMENT_TARGET = 16.0

// Signing

CODE_SIGN_STYLE = Manual
DEVELOPMENT_TEAM = PZYM8XX95Q

WP_APP_GROUP_NAME = group.org.wordpress
WP_APP_KEYCHAIN_ACCESS_GROUP = 3TMU3BH3NK.org.wordpress
CODE_SIGN_IDENTITY[config=Debug] = Apple Development: Created via API (886NX39KP6)

DEVELOPMENT_TEAM[config=Debug] = PZYM8XX95Q
DEVELOPMENT_TEAM[config=Release-Alpha] = 99KV9Z6BKV
DEVELOPMENT_TEAM[config=Release] = PZYM8XX95Q

// WordPress Apps

WP_APP_GROUP_NAME[config=Debug] = group.org.wordpress
WP_APP_GROUP_NAME[config=Release-Alpha] = group.org.wordpress.alpha
WP_APP_GROUP_NAME[config=Release] = group.org.wordpress

WP_APP_KEYCHAIN_ACCESS_GROUP[config=Debug] = 3TMU3BH3NK.org.wordpress
WP_APP_KEYCHAIN_ACCESS_GROUP[config=Release-Alpha] = 99KV9Z6BKV.org.wordpress.alpha
WP_APP_KEYCHAIN_ACCESS_GROUP[config=Release] = 3TMU3BH3NK.org.wordpress

WP_BUILD_CONFIGURATION[config=Debug] = debug
WP_BUILD_CONFIGURATION[config=Release-Alpha] = alpha
WP_BUILD_CONFIGURATION[config=Release] = release
4 changes: 2 additions & 2 deletions config/Jetpack.alpha.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Common.enterprise.xcconfig"
#include "Version.public.xcconfig"
#include "Common.xcconfig"

BUILD_SCHEME = Jetpack
WP_PUSH_NOTIFICATION_APP_ID = "com.jetpack.alpha"
WP_BUILD_CONFIGURATION = alpha
4 changes: 2 additions & 2 deletions config/Jetpack.debug.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Common.debug.xcconfig"
#include "Version.public.xcconfig"
#include "Common.xcconfig"

BUILD_SCHEME = Jetpack
WP_PUSH_NOTIFICATION_APP_ID = "com.jetpack.appstore.dev"
WP_BUILD_CONFIGURATION = debug
4 changes: 3 additions & 1 deletion config/Jetpack.release.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include "Version.public.xcconfig"
#include "Common.xcconfig"

BUILD_SCHEME = Jetpack
WP_PUSH_NOTIFICATION_APP_ID = "com.jetpack.appstore"
WP_BUILD_CONFIGURATION = release
3 changes: 1 addition & 2 deletions config/WordPress.alpha.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "Version.public.xcconfig"
#include "Common.enterprise.xcconfig"
#include "Common.xcconfig"

BUILD_SCHEME = WordPress Alpha
WP_PUSH_NOTIFICATION_APP_ID = "org.wordpress.alpha"
WP_BUILD_CONFIGURATION = alpha
3 changes: 1 addition & 2 deletions config/WordPress.debug.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "Version.public.xcconfig"
#include "Common.debug.xcconfig"
#include "Common.xcconfig"

BUILD_SCHEME = WordPress
WP_PUSH_NOTIFICATION_APP_ID = "org.wordpress.appstore.dev"
WP_BUILD_CONFIGURATION = debug
1 change: 0 additions & 1 deletion config/WordPress.release.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@

BUILD_SCHEME = WordPress
WP_PUSH_NOTIFICATION_APP_ID = "org.wordpress.appstore"
WP_BUILD_CONFIGURATION = release
2 changes: 1 addition & 1 deletion config/WordPressAuthenticator.enterprise.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#include "WordPressAuthenticator.xcconfig"
#include "Common.enterprise.xcconfig"
#include "Common.xcconfig"
10 changes: 0 additions & 10 deletions config/WordPressKit.xcconfig
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions config/WordPressKitTests.xcconfig
View file
Open in desktop

This file was deleted.