Skip to content
This repository has been archived by the owner on Aug 7, 2021. It is now read-only.

Commit

Permalink
Merge pull request #451 from aaronbrethorst/little-bits-of-sad
Browse files Browse the repository at this point in the history 
Bundle Version Simplification
  • Loading branch information
@aaronbrethorst
aaronbrethorst committed Oct 29, 2015
2 parents a3ee499 + c179fbb commit 4251730
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 203 deletions.
2 changes: 1 addition & 1 deletion Info.plist
View file
Expand Up @@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>GIT_COMMIT_SHA</string>
<string>20151029.00</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
171 changes: 8 additions & 163 deletions org.onebusaway.iphone.xcodeproj/project.pbxproj
View file
Expand Up @@ -6,21 +6,6 @@
objectVersion = 46;
objects = {

/* Begin PBXAggregateTarget section */
96C6447B1810B4A70000EC49 /* Versioning */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 96C644801810B4A70000EC49 /* Build configuration list for PBXAggregateTarget "Versioning" */;
buildPhases = (
E81C7AFD1824AE960047C68C /* Set bundle identifier based on current build configuration */,
96C644841810B4EE0000EC49 /* Set preprocessor definition for current git commit short SHA with dirty inditicator (+) */,
);
dependencies = (
);
name = Versioning;
productName = Versioning;
};
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
60E26094D209E76D5D037634 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2B89E834A0C9E7F5B8FE39B /* libPods.a */; };
Expand Down Expand Up @@ -118,13 +103,6 @@
remoteGlobalIDString = 1D6058900D05DD3D006BFB54;
remoteInfo = OneBusAway;
};
96C644821810B4D80000EC49 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 96C6447B1810B4A70000EC49;
remoteInfo = Versioning;
};
B58A05741AFF5F6F007C9E4A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 669B2D5A1AEBE63800CF2367 /* OneBusAwaySDK.xcodeproj */;
Expand All @@ -141,18 +119,6 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
D6B74DF90F6CA5D80067D68F /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
13105E482CCDE283CE77C92E /* Pods.adhocdistribution.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.adhocdistribution.xcconfig; path = "Pods/Target Support Files/Pods/Pods.adhocdistribution.xcconfig"; sourceTree = "<group>"; };
1D6058910D05DD3D006BFB54 /* OneBusAway.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OneBusAway.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -759,14 +725,11 @@
1D60588D0D05DD3D006BFB54 /* Resources */,
1D60588E0D05DD3D006BFB54 /* Sources */,
1D60588F0D05DD3D006BFB54 /* Frameworks */,
D6B74DF90F6CA5D80067D68F /* CopyFiles */,
E81C7AFE1824B7C80047C68C /* Remove infoplist.prefix preprocessor file from project temp directory */,
CCD9E7D7D1BC4AE93C05BC2C /* Copy Pods Resources */,
);
buildRules = (
);
dependencies = (
96C644831810B4D80000EC49 /* PBXTargetDependency */,
);
name = OneBusAway;
productName = org.onebusaway.iphone;
Expand Down Expand Up @@ -841,7 +804,6 @@
projectRoot = "";
targets = (
1D6058900D05DD3D006BFB54 /* OneBusAway */,
96C6447B1810B4A70000EC49 /* Versioning */,
93F152F01A9AE91A0015C141 /* OneBusAway Tests */,
);
};
Expand Down Expand Up @@ -947,21 +909,6 @@
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
96C644841810B4EE0000EC49 /* Set preprocessor definition for current git commit short SHA with dirty inditicator (+) */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Set preprocessor definition for current git commit short SHA with dirty inditicator (+)";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\nsh \"${PROJECT_DIR}/scripts/setBuildVersion.sh\"";
showEnvVarsInLog = 0;
};
CCD9E7D7D1BC4AE93C05BC2C /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -977,36 +924,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E81C7AFD1824AE960047C68C /* Set bundle identifier based on current build configuration */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Set bundle identifier based on current build configuration";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\nsh \"${PROJECT_DIR}/scripts/setBundleIdentifierForAppStore.sh\"";
showEnvVarsInLog = 0;
};
E81C7AFE1824B7C80047C68C /* Remove infoplist.prefix preprocessor file from project temp directory */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Remove infoplist.prefix preprocessor file from project temp directory";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "rm $PROJECT_TEMP_DIR/infoplist.prefix";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -1094,11 +1011,6 @@
target = 1D6058900D05DD3D006BFB54 /* OneBusAway */;
targetProxy = 93F152F71A9AE91A0015C141 /* PBXContainerItemProxy */;
};
96C644831810B4D80000EC49 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 96C6447B1810B4A70000EC49 /* Versioning */;
targetProxy = 96C644821810B4D80000EC49 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -1144,15 +1056,9 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/infoplist.prefix;
INFOPLIST_PREPROCESS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-weak_framework",
MapKit,
);
PRODUCT_BUNDLE_IDENTIFIER = "org.onebusaway.iphone.$(PRODUCT_NAME:rfc1034identifier)";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.onebusaway.iphone;
PRODUCT_NAME = OneBusAway;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
Expand Down Expand Up @@ -1198,15 +1104,9 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/infoplist.prefix;
INFOPLIST_PREPROCESS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-weak_framework",
MapKit,
);
PRODUCT_BUNDLE_IDENTIFIER = "org.onebusaway.iphone.$(PRODUCT_NAME:rfc1034identifier)";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.onebusaway.iphone;
PRODUCT_NAME = OneBusAway;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
Expand Down Expand Up @@ -1384,38 +1284,6 @@
};
name = AdHocDistribution;
};
96C6447C1810B4A70000EC49 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
96C6447D1810B4A70000EC49 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
96C6447E1810B4A70000EC49 /* AppStoreDistribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = AppStoreDistribution;
};
96C6447F1810B4A70000EC49 /* AdHocDistribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = AdHocDistribution;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -1512,15 +1380,9 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/infoplist.prefix;
INFOPLIST_PREPROCESS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-weak_framework",
MapKit,
);
PRODUCT_BUNDLE_IDENTIFIER = "org.onebusaway.iphone.$(PRODUCT_NAME:rfc1034identifier)";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.onebusaway.iphone;
PRODUCT_NAME = OneBusAway;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
Expand Down Expand Up @@ -1584,15 +1446,9 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/infoplist.prefix;
INFOPLIST_PREPROCESS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-weak_framework",
MapKit,
);
PRODUCT_BUNDLE_IDENTIFIER = "org.onebusaway.iphone.$(PRODUCT_NAME:rfc1034identifier)";
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.onebusaway.iphone;
PRODUCT_NAME = OneBusAway;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
Expand Down Expand Up @@ -1627,17 +1483,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
96C644801810B4A70000EC49 /* Build configuration list for PBXAggregateTarget "Versioning" */ = {
isa = XCConfigurationList;
buildConfigurations = (
96C6447C1810B4A70000EC49 /* Debug */,
96C6447D1810B4A70000EC49 /* Release */,
96C6447E1810B4A70000EC49 /* AppStoreDistribution */,
96C6447F1810B4A70000EC49 /* AdHocDistribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "org.onebusaway.iphone" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
30 changes: 0 additions & 30 deletions scripts/setBuildVersion.sh
View file

This file was deleted.

9 changes: 0 additions & 9 deletions scripts/setBundleIdentifierForAppStore.sh
View file

This file was deleted.

0 comments on commit 4251730

Please sign in to comment.