Merge branch 'main' into development

Author: macmade

ColorSet.xcodeproj/project.pbxproj

@@ -550,7 +550,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -d \"$SRCROOT/Submodules/cgl\" ] && [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    make -f $SRCROOT/Submodules/cgl/Makefile mit\nfi\n";
+			shellScript = "if [ -z \"$CI\" ] && [ -d \"$SRCROOT/Submodules/cgl\" ] && [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    make -f $SRCROOT/Submodules/cgl/Makefile mit\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -684,7 +684,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = ColorSet/ColorSet.entitlements;
-				CODE_SIGN_IDENTITY = "Mac Developer";
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = ColorSet/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -702,7 +701,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = ColorSet/ColorSet.entitlements;
-				CODE_SIGN_IDENTITY = "Mac Developer";
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = ColorSet/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ColorSetKit.xcodeproj/project.pbxproj

@@ -405,7 +405,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -d \"$SRCROOT/Submodules/cgl\" ] && [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    make -f $SRCROOT/Submodules/cgl/Makefile mit\nfi\n";
+			shellScript = "if [ -z \"$CI\" ] && [ -d \"$SRCROOT/Submodules/cgl\" ] && [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    make -f $SRCROOT/Submodules/cgl/Makefile mit\nfi\n";
 		};
 		0587465E28E2E0FD00861788 /* Swift Format */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -424,7 +424,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -d \"$SRCROOT/Submodules/cgl\" ] && [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    make -f $SRCROOT/Submodules/cgl/Makefile mit\nfi\n";
+			shellScript = "if [ -z \"$CI\" ] && [ -d \"$SRCROOT/Submodules/cgl\" ] && [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    make -f $SRCROOT/Submodules/cgl/Makefile mit\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */