Skip to content

Commit cad4230

Browse files
Directly use pbxproj variables
1 parent 40f2cc5 commit cad4230

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed

.env-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DEVELOPMENT_TEAM=TEAM

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ xcuserdata
33
ExportOptions.plist
44
Export
55
*.xcarchive
6+
.env

Config/Config.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,21 @@ release/*)
3030
;;
3131
esac
3232

33+
current_directory=$(dirname $0)
34+
env_file=$current_directory/../.env
35+
36+
if [ -f $env_file ]
37+
then
38+
source $env_file
39+
fi
40+
3341
cat <<< "
3442
SLASH=/
35-
VERSION_NUMBER=$commit_count.$version_number_suffix
36-
VERSION_STRING=$version_string
43+
DEVELOPMENT_TEAM=$DEVELOPMENT_TEAM
44+
CURRENT_PROJECT_VERSION=$commit_count.$version_number_suffix
45+
MARKETING_VERSION=$version_string
3746
SENTRY_DSN=${SENTRY_DSN//\//\$(SLASH)}
3847
SENTRY_ORG=$SENTRY_ORG
3948
SENTRY_PROJECT=$SENTRY_PROJECT
4049
SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
41-
" | tee $(dirname $0)/Config.xcconfig
50+
" | tee $current_directory/Config.xcconfig

Fyreplace.xcodeproj/project.pbxproj

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@
110110
4DCE062A2C08E5E200F69AF1 /* CompactNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompactNavigation.swift; sourceTree = "<group>"; };
111111
4DCE062C2C08E65300F69AF1 /* RegularNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegularNavigation.swift; sourceTree = "<group>"; };
112112
4DCE06312C09E19400F69AF1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
113+
4DCEF8652C452EBA00F53085 /* .env-example */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".env-example"; sourceTree = "<group>"; };
114+
4DCEF8662C452ECC00F53085 /* .env */ = {isa = PBXFileReference; lastKnownFileType = text; path = .env; sourceTree = "<group>"; };
113115
4DD826FD2BF9FDC500799CEB /* Config.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = Config.sh; sourceTree = "<group>"; };
114116
/* End PBXFileReference section */
115117

@@ -187,6 +189,8 @@
187189
4D54C9462BF26090001DE071 /* FyreplaceUITests */,
188190
4D54C9632BF28695001DE071 /* .gitignore */,
189191
4D0DDC292C18A467006CD503 /* .xcode-version */,
192+
4DCEF8652C452EBA00F53085 /* .env-example */,
193+
4DCEF8662C452ECC00F53085 /* .env */,
190194
4D54C9592BF266F9001DE071 /* Makefile */,
191195
4D54C9582BF266F9001DE071 /* README.md */,
192196
4D54C9572BF266F9001DE071 /* COPYING.txt */,
@@ -687,7 +691,6 @@
687691
CODE_SIGN_ENTITLEMENTS = "${TARGET_NAME}/Config/Fyreplace.debug.entitlements";
688692
CODE_SIGN_IDENTITY = "Apple Development";
689693
CODE_SIGN_STYLE = Automatic;
690-
CURRENT_PROJECT_VERSION = "$(VERSION_NUMBER)";
691694
DEVELOPMENT_ASSET_PATHS = "\"${TARGET_NAME}/Preview Content\"";
692695
"ENABLE_APP_SANDBOX[sdk=macosx*]" = YES;
693696
ENABLE_PREVIEWS = YES;
@@ -707,7 +710,6 @@
707710
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
708711
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
709712
MACOSX_DEPLOYMENT_TARGET = 13.0;
710-
MARKETING_VERSION = "$(VERSION_STRING)";
711713
PRODUCT_BUNDLE_IDENTIFIER = app.fyreplace.Fyreplace;
712714
PRODUCT_NAME = "$(TARGET_NAME)";
713715
SDKROOT = auto;
@@ -726,7 +728,6 @@
726728
CODE_SIGN_ENTITLEMENTS = "${TARGET_NAME}/Config/Fyreplace.release.entitlements";
727729
CODE_SIGN_IDENTITY = "Apple Distribution";
728730
CODE_SIGN_STYLE = Manual;
729-
CURRENT_PROJECT_VERSION = "$(VERSION_NUMBER)";
730731
DEVELOPMENT_ASSET_PATHS = "\"${TARGET_NAME}/Preview Content\"";
731732
"ENABLE_APP_SANDBOX[sdk=macosx*]" = YES;
732733
ENABLE_HARDENED_RUNTIME = YES;
@@ -747,7 +748,6 @@
747748
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
748749
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
749750
MACOSX_DEPLOYMENT_TARGET = 13.0;
750-
MARKETING_VERSION = "$(VERSION_STRING)";
751751
PRODUCT_BUNDLE_IDENTIFIER = app.fyreplace.Fyreplace;
752752
PRODUCT_NAME = "$(TARGET_NAME)";
753753
PROVISIONING_PROFILE_SPECIFIER = Fyreplace;
@@ -765,13 +765,10 @@
765765
buildSettings = {
766766
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
767767
BUNDLE_LOADER = "$(TEST_HOST)";
768-
CODE_SIGN_STYLE = Automatic;
769-
CURRENT_PROJECT_VERSION = "$(VERSION_NUMBER)";
770768
DEAD_CODE_STRIPPING = YES;
771769
GENERATE_INFOPLIST_FILE = YES;
772770
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
773771
MACOSX_DEPLOYMENT_TARGET = 13.0;
774-
MARKETING_VERSION = "$(VERSION_STRING)";
775772
PRODUCT_BUNDLE_IDENTIFIER = app.fyreplace.FyreplaceTests;
776773
PRODUCT_NAME = "$(TARGET_NAME)";
777774
SDKROOT = auto;
@@ -788,13 +785,10 @@
788785
buildSettings = {
789786
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
790787
BUNDLE_LOADER = "$(TEST_HOST)";
791-
CODE_SIGN_STYLE = Automatic;
792-
CURRENT_PROJECT_VERSION = "$(VERSION_NUMBER)";
793788
DEAD_CODE_STRIPPING = YES;
794789
GENERATE_INFOPLIST_FILE = YES;
795790
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
796791
MACOSX_DEPLOYMENT_TARGET = 13.0;
797-
MARKETING_VERSION = "$(VERSION_STRING)";
798792
PRODUCT_BUNDLE_IDENTIFIER = app.fyreplace.FyreplaceTests;
799793
PRODUCT_NAME = "$(TARGET_NAME)";
800794
SDKROOT = auto;
@@ -810,13 +804,10 @@
810804
isa = XCBuildConfiguration;
811805
buildSettings = {
812806
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
813-
CODE_SIGN_STYLE = Automatic;
814-
CURRENT_PROJECT_VERSION = "$(VERSION_NUMBER)";
815807
DEAD_CODE_STRIPPING = YES;
816808
GENERATE_INFOPLIST_FILE = YES;
817809
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
818810
MACOSX_DEPLOYMENT_TARGET = 13.0;
819-
MARKETING_VERSION = "$(VERSION_STRING)";
820811
PRODUCT_BUNDLE_IDENTIFIER = app.fyreplace.FyreplaceUITests;
821812
PRODUCT_NAME = "$(TARGET_NAME)";
822813
SDKROOT = auto;
@@ -832,13 +823,10 @@
832823
isa = XCBuildConfiguration;
833824
buildSettings = {
834825
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
835-
CODE_SIGN_STYLE = Automatic;
836-
CURRENT_PROJECT_VERSION = "$(VERSION_NUMBER)";
837826
DEAD_CODE_STRIPPING = YES;
838827
GENERATE_INFOPLIST_FILE = YES;
839828
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
840829
MACOSX_DEPLOYMENT_TARGET = 13.0;
841-
MARKETING_VERSION = "$(VERSION_STRING)";
842830
PRODUCT_BUNDLE_IDENTIFIER = app.fyreplace.FyreplaceUITests;
843831
PRODUCT_NAME = "$(TARGET_NAME)";
844832
SDKROOT = auto;

0 commit comments

Comments
 (0)