Skip to content

Commit 46ba42b

Browse files
author
Darin Krauss
authored
Update build process to support automated pushes to Test Flight (#54)
- Split version config into separate file; add code signing and provisioning configuration - Update config override and derived assets mechanisms to avoid peeking into parent directory - Report full version (short version string and build number) from Bundle - Fix CFBundleVersion in Info.plist of DoseMathTests and LoopTests targets to correctly use CURRENT_PROJECT_VERSION - Fix warning in CLKTextProvider+Compound.m - Remove extraneous rileylink_ios Crypto library inclusion - Clean up project file - Use configurable entitlements for the Loop app - Remove extraneous Scripts reference in project
1 parent a8ba7ca commit 46ba42b

File tree

75 files changed

+513
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+513
-321
lines changed

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ RemoteSettings.plist
7171
# Framework development
7272
Loop.xcworkspace
7373

74-
# Avoid checking in built assets
75-
Loop/DerivedAssets.xcassets/
76-
WatchApp/DerivedAssets.xcassets/
74+
# Avoid checking in override assets
75+
/LoopOverride.xcconfig
76+
/VersionOverride.xcconfig
77+
/Loop/DerivedAssets.xcassets
78+
/Loop/DerivedAssetsOverride.xcassets
79+
/WatchApp/DerivedAssets.xcassets
80+
/WatchApp/DerivedAssetsOverride.xcassets

Common/Extensions/NSBundle.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,24 @@ import Foundation
1010

1111

1212
extension Bundle {
13+
var fullVersionString: String {
14+
return "\(shortVersionString).\(version)"
15+
}
16+
1317
var shortVersionString: String {
1418
return object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
1519
}
1620

21+
var version: String {
22+
return object(forInfoDictionaryKey: "CFBundleVersion") as! String
23+
}
24+
1725
var bundleDisplayName: String {
1826
return object(forInfoDictionaryKey: "CFBundleDisplayName") as! String
1927
}
2028

2129
var localizedNameAndVersion: String {
22-
return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, shortVersionString)
30+
return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, fullVersionString)
2331
}
2432

2533
private var mainAppBundleIdentifier: String? {

DoseMathTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
</dict>
2424
</plist>

Loop.xcconfig

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,30 @@
99
// This is automatically disambiguated by development team, but you may choose to change this to
1010
// support running multiple apps simultaneously.
1111
MAIN_APP_BUNDLE_IDENTIFIER = com.${DEVELOPMENT_TEAM}.loopkit
12-
MAIN_APP_DISPLAY_NAME = Loop
1312

14-
LOOP_MARKETING_VERSION = 1.10.1
13+
// Application name [DEFAULT]
14+
MAIN_APP_DISPLAY_NAME = Loop
1515

16+
// Appication icon [DEFAULT]
1617
APPICON_NAME = AppIcon
1718

18-
// Optional workspace configuration overrides
19-
#include? "../LoopConfigOverride.xcconfig"
19+
// Features [DEFAULT]
20+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited)
21+
22+
// Entitlements [DEFAULT]
23+
LOOP_ENTITLEMENTS = Loop/Loop.entitlements
24+
25+
// Code signing and provisioning [DEFAULT]
26+
LOOP_CODE_SIGN_IDENTITY = Apple Development
27+
LOOP_CODE_SIGN_STYLE = Automatic
28+
LOOP_DEVELOPMENT_TEAM =
29+
LOOP_PROVISIONING_PROFILE_SPECIFIER =
30+
LOOP_PROVISIONING_PROFILE_SPECIFIER_STATUS_EXTENSION =
31+
LOOP_PROVISIONING_PROFILE_SPECIFIER_WATCHAPP =
32+
LOOP_PROVISIONING_PROFILE_SPECIFIER_WATCHAPP_EXTENSION =
33+
34+
// Version [DEFAULT]
35+
#include? "Version.xcconfig"
2036

37+
// Optional overrides
38+
#include? "LoopOverride.xcconfig"

Loop.xcodeproj/project.pbxproj

Lines changed: 195 additions & 285 deletions
Large diffs are not rendered by default.

Loop/DefaultAssets.xcassets/AppIcon.appiconset/AppStore-1024pt@1x.png renamed to Loop/DerivedAssets.xcassets/AppIcon.appiconset/AppStore-1024pt@1x.png

File renamed without changes.

Loop/DefaultAssets.xcassets/AppIcon.appiconset/Contents.json renamed to Loop/DerivedAssets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

Loop/DefaultAssets.xcassets/AppIcon.appiconset/Icon-60@2x.png renamed to Loop/DerivedAssets.xcassets/AppIcon.appiconset/Icon-60@2x.png

File renamed without changes.

Loop/DefaultAssets.xcassets/AppIcon.appiconset/Icon-60@3x.png renamed to Loop/DerivedAssets.xcassets/AppIcon.appiconset/Icon-60@3x.png

File renamed without changes.

Loop/DefaultAssets.xcassets/AppIcon.appiconset/Icon-76.png renamed to Loop/DerivedAssets.xcassets/AppIcon.appiconset/Icon-76.png

File renamed without changes.

0 commit comments

Comments
 (0)