Skip to content

Commit 91875ab

Browse files
jdeejdee
authored
Merge pull request #20 from jdee/commit-version-bump-enhancements
Commit version bump enhancements
2 parents eb24d7e + f1a689c commit 91875ab

File tree

14 files changed

+646
-21
lines changed

14 files changed

+646
-21
lines changed

‎README.md‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,32 +124,25 @@ update_settings_bundle(
124124

125125
### Use with commit_version_bump
126126

127-
The built-in `commit_version_bump` action can optionally include files from the
128-
`Settings.bundle` using the `:settings` option. See [the Fastlane docs](https://docs.fastlane.tools/actions/#source-control)
129-
for more details on `commit_version_bump`.
127+
As of version 1.3.0 (which requires Fastlane 2.64.0), it is no longer necessary
128+
to pass a `settings` parameter to the built-in `commit_version_bump` action
129+
when using `update_settings_bundle`.
130130

131-
To include an update to `Settings.bundle/Root.plist` in your version bump, pass
132-
`settings: true`:
133131
```ruby
134132
increment_build_number
135133
update_settings_bundle key: "CurrentAppVersion",
136134
value: ":version (:build)"
137-
commit_version_bump settings: true
135+
commit_version_bump
138136
```
139137

140-
To include an update to `Settings.bundle/About.plist` in your version bump,
141-
pass a string argument for `:settings` with the name of the file in the
142-
`Settings.bundle`:
143138
```ruby
144139
increment_build_number
145140
update_settings_bundle key: "CurrentAppVersion",
146141
value: ":version (:build)",
147142
file: "About.plist"
148-
commit_version_bump settings: "About.plist"
143+
commit_version_bump
149144
```
150145

151-
To include multiple plists from the `Settings.bundle`, specify an array of
152-
strings for the `:settings` option:
153146
```ruby
154147
increment_build_number
155148
update_settings_bundle key: "CurrentAppVersion",
@@ -158,10 +151,7 @@ update_settings_bundle key: "CurrentFrameworkVersion",
158151
value: ":version (:build)",
159152
file: "Framework.plist",
160153
target: "MyFramework"
161-
commit_version_bump settings: %w{
162-
Framework.plist
163-
Root.plist
164-
}
154+
commit_version_bump
165155
```
166156

167157
Also see the [example apps](./examples) and [example Fastfile](./fastlane/Fastfile) in the repo.

‎examples/SettingsBundleGroupExample/SettingsBundleGroupExample.xcodeproj/project.pbxproj‎

Lines changed: 315 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,315 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 46;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
7BE144DB1EE9C82100997941 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE144DA1EE9C82100997941 /* AppDelegate.swift */; };
11+
7BE144DD1EE9C82100997941 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BE144DC1EE9C82100997941 /* ViewController.swift */; };
12+
7BE144E01EE9C82100997941 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7BE144DE1EE9C82100997941 /* Main.storyboard */; };
13+
7BE144E21EE9C82100997941 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7BE144E11EE9C82100997941 /* Assets.xcassets */; };
14+
7BE144E51EE9C82100997941 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7BE144E31EE9C82100997941 /* LaunchScreen.storyboard */; };
15+
7BE144ED1EE9C83500997941 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7BE144EC1EE9C83500997941 /* Settings.bundle */; };
16+
/* End PBXBuildFile section */
17+
18+
/* Begin PBXFileReference section */
19+
7BE144D71EE9C82100997941 /* SettingsBundleGroupExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SettingsBundleGroupExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
20+
7BE144DA1EE9C82100997941 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
21+
7BE144DC1EE9C82100997941 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
22+
7BE144DF1EE9C82100997941 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
23+
7BE144E11EE9C82100997941 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
24+
7BE144E41EE9C82100997941 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
25+
7BE144E61EE9C82100997941 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
26+
7BE144EC1EE9C83500997941 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
27+
/* End PBXFileReference section */
28+
29+
/* Begin PBXFrameworksBuildPhase section */
30+
7BE144D41EE9C82100997941 /* Frameworks */ = {
31+
isa = PBXFrameworksBuildPhase;
32+
buildActionMask = 2147483647;
33+
files = (
34+
);
35+
runOnlyForDeploymentPostprocessing = 0;
36+
};
37+
/* End PBXFrameworksBuildPhase section */
38+
39+
/* Begin PBXGroup section */
40+
7BE144CE1EE9C82100997941 = {
41+
isa = PBXGroup;
42+
children = (
43+
7BE144D91EE9C82100997941 /* SettingsBundleGroupExample */,
44+
7BE144D81EE9C82100997941 /* Products */,
45+
);
46+
sourceTree = "<group>";
47+
};
48+
7BE144D81EE9C82100997941 /* Products */ = {
49+
isa = PBXGroup;
50+
children = (
51+
7BE144D71EE9C82100997941 /* SettingsBundleGroupExample.app */,
52+
);
53+
name = Products;
54+
sourceTree = "<group>";
55+
};
56+
7BE144D91EE9C82100997941 /* SettingsBundleGroupExample */ = {
57+
isa = PBXGroup;
58+
children = (
59+
7BE144EC1EE9C83500997941 /* Settings.bundle */,
60+
7BE144DA1EE9C82100997941 /* AppDelegate.swift */,
61+
7BE144DC1EE9C82100997941 /* ViewController.swift */,
62+
7BE144DE1EE9C82100997941 /* Main.storyboard */,
63+
7BE144E11EE9C82100997941 /* Assets.xcassets */,
64+
7BE144E31EE9C82100997941 /* LaunchScreen.storyboard */,
65+
7BE144E61EE9C82100997941 /* Info.plist */,
66+
);
67+
path = SettingsBundleGroupExample;
68+
sourceTree = "<group>";
69+
};
70+
/* End PBXGroup section */
71+
72+
/* Begin PBXNativeTarget section */
73+
7BE144D61EE9C82100997941 /* SettingsBundleGroupExample */ = {
74+
isa = PBXNativeTarget;
75+
buildConfigurationList = 7BE144E91EE9C82100997941 /* Build configuration list for PBXNativeTarget "SettingsBundleGroupExample" */;
76+
buildPhases = (
77+
7BE144D31EE9C82100997941 /* Sources */,
78+
7BE144D41EE9C82100997941 /* Frameworks */,
79+
7BE144D51EE9C82100997941 /* Resources */,
80+
);
81+
buildRules = (
82+
);
83+
dependencies = (
84+
);
85+
name = SettingsBundleGroupExample;
86+
productName = SettingsBundleGroupExample;
87+
productReference = 7BE144D71EE9C82100997941 /* SettingsBundleGroupExample.app */;
88+
productType = "com.apple.product-type.application";
89+
};
90+
/* End PBXNativeTarget section */
91+
92+
/* Begin PBXProject section */
93+
7BE144CF1EE9C82100997941 /* Project object */ = {
94+
isa = PBXProject;
95+
attributes = {
96+
LastSwiftUpdateCheck = 0830;
97+
LastUpgradeCheck = 0830;
98+
ORGANIZATIONNAME = "Jimmy Dee";
99+
TargetAttributes = {
100+
7BE144D61EE9C82100997941 = {
101+
CreatedOnToolsVersion = 8.3.2;
102+
ProvisioningStyle = Automatic;
103+
};
104+
};
105+
};
106+
buildConfigurationList = 7BE144D21EE9C82100997941 /* Build configuration list for PBXProject "SettingsBundleGroupExample" */;
107+
compatibilityVersion = "Xcode 3.2";
108+
developmentRegion = English;
109+
hasScannedForEncodings = 0;
110+
knownRegions = (
111+
en,
112+
Base,
113+
);
114+
mainGroup = 7BE144CE1EE9C82100997941;
115+
productRefGroup = 7BE144D81EE9C82100997941 /* Products */;
116+
projectDirPath = "";
117+
projectRoot = "";
118+
targets = (
119+
7BE144D61EE9C82100997941 /* SettingsBundleGroupExample */,
120+
);
121+
};
122+
/* End PBXProject section */
123+
124+
/* Begin PBXResourcesBuildPhase section */
125+
7BE144D51EE9C82100997941 /* Resources */ = {
126+
isa = PBXResourcesBuildPhase;
127+
buildActionMask = 2147483647;
128+
files = (
129+
7BE144ED1EE9C83500997941 /* Settings.bundle in Resources */,
130+
7BE144E51EE9C82100997941 /* LaunchScreen.storyboard in Resources */,
131+
7BE144E21EE9C82100997941 /* Assets.xcassets in Resources */,
132+
7BE144E01EE9C82100997941 /* Main.storyboard in Resources */,
133+
);
134+
runOnlyForDeploymentPostprocessing = 0;
135+
};
136+
/* End PBXResourcesBuildPhase section */
137+
138+
/* Begin PBXSourcesBuildPhase section */
139+
7BE144D31EE9C82100997941 /* Sources */ = {
140+
isa = PBXSourcesBuildPhase;
141+
buildActionMask = 2147483647;
142+
files = (
143+
7BE144DD1EE9C82100997941 /* ViewController.swift in Sources */,
144+
7BE144DB1EE9C82100997941 /* AppDelegate.swift in Sources */,
145+
);
146+
runOnlyForDeploymentPostprocessing = 0;
147+
};
148+
/* End PBXSourcesBuildPhase section */
149+
150+
/* Begin PBXVariantGroup section */
151+
7BE144DE1EE9C82100997941 /* Main.storyboard */ = {
152+
isa = PBXVariantGroup;
153+
children = (
154+
7BE144DF1EE9C82100997941 /* Base */,
155+
);
156+
name = Main.storyboard;
157+
sourceTree = "<group>";
158+
};
159+
7BE144E31EE9C82100997941 /* LaunchScreen.storyboard */ = {
160+
isa = PBXVariantGroup;
161+
children = (
162+
7BE144E41EE9C82100997941 /* Base */,
163+
);
164+
name = LaunchScreen.storyboard;
165+
sourceTree = "<group>";
166+
};
167+
/* End PBXVariantGroup section */
168+
169+
/* Begin XCBuildConfiguration section */
170+
7BE144E71EE9C82100997941 /* Debug */ = {
171+
isa = XCBuildConfiguration;
172+
buildSettings = {
173+
ALWAYS_SEARCH_USER_PATHS = NO;
174+
CLANG_ANALYZER_NONNULL = YES;
175+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
176+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
177+
CLANG_CXX_LIBRARY = "libc++";
178+
CLANG_ENABLE_MODULES = YES;
179+
CLANG_ENABLE_OBJC_ARC = YES;
180+
CLANG_WARN_BOOL_CONVERSION = YES;
181+
CLANG_WARN_CONSTANT_CONVERSION = YES;
182+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
183+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
184+
CLANG_WARN_EMPTY_BODY = YES;
185+
CLANG_WARN_ENUM_CONVERSION = YES;
186+
CLANG_WARN_INFINITE_RECURSION = YES;
187+
CLANG_WARN_INT_CONVERSION = YES;
188+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
189+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
190+
CLANG_WARN_UNREACHABLE_CODE = YES;
191+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
192+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
193+
COPY_PHASE_STRIP = NO;
194+
CURRENT_PROJECT_VERSION = 1;
195+
DEBUG_INFORMATION_FORMAT = dwarf;
196+
ENABLE_STRICT_OBJC_MSGSEND = YES;
197+
ENABLE_TESTABILITY = YES;
198+
GCC_C_LANGUAGE_STANDARD = gnu99;
199+
GCC_DYNAMIC_NO_PIC = NO;
200+
GCC_NO_COMMON_BLOCKS = YES;
201+
GCC_OPTIMIZATION_LEVEL = 0;
202+
GCC_PREPROCESSOR_DEFINITIONS = (
203+
"DEBUG=1",
204+
"$(inherited)",
205+
);
206+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
207+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
208+
GCC_WARN_UNDECLARED_SELECTOR = YES;
209+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
210+
GCC_WARN_UNUSED_FUNCTION = YES;
211+
GCC_WARN_UNUSED_VARIABLE = YES;
212+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
213+
MTL_ENABLE_DEBUG_INFO = YES;
214+
ONLY_ACTIVE_ARCH = YES;
215+
SDKROOT = iphoneos;
216+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
217+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
218+
TARGETED_DEVICE_FAMILY = "1,2";
219+
};
220+
name = Debug;
221+
};
222+
7BE144E81EE9C82100997941 /* Release */ = {
223+
isa = XCBuildConfiguration;
224+
buildSettings = {
225+
ALWAYS_SEARCH_USER_PATHS = NO;
226+
CLANG_ANALYZER_NONNULL = YES;
227+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
228+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
229+
CLANG_CXX_LIBRARY = "libc++";
230+
CLANG_ENABLE_MODULES = YES;
231+
CLANG_ENABLE_OBJC_ARC = YES;
232+
CLANG_WARN_BOOL_CONVERSION = YES;
233+
CLANG_WARN_CONSTANT_CONVERSION = YES;
234+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
235+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
236+
CLANG_WARN_EMPTY_BODY = YES;
237+
CLANG_WARN_ENUM_CONVERSION = YES;
238+
CLANG_WARN_INFINITE_RECURSION = YES;
239+
CLANG_WARN_INT_CONVERSION = YES;
240+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
241+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
242+
CLANG_WARN_UNREACHABLE_CODE = YES;
243+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
244+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
245+
COPY_PHASE_STRIP = NO;
246+
CURRENT_PROJECT_VERSION = 1;
247+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
248+
ENABLE_NS_ASSERTIONS = NO;
249+
ENABLE_STRICT_OBJC_MSGSEND = YES;
250+
GCC_C_LANGUAGE_STANDARD = gnu99;
251+
GCC_NO_COMMON_BLOCKS = YES;
252+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
253+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
254+
GCC_WARN_UNDECLARED_SELECTOR = YES;
255+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
256+
GCC_WARN_UNUSED_FUNCTION = YES;
257+
GCC_WARN_UNUSED_VARIABLE = YES;
258+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
259+
MTL_ENABLE_DEBUG_INFO = NO;
260+
SDKROOT = iphoneos;
261+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
262+
TARGETED_DEVICE_FAMILY = "1,2";
263+
VALIDATE_PRODUCT = YES;
264+
};
265+
name = Release;
266+
};
267+
7BE144EA1EE9C82100997941 /* Debug */ = {
268+
isa = XCBuildConfiguration;
269+
buildSettings = {
270+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
271+
INFOPLIST_FILE = SettingsBundleGroupExample/Info.plist;
272+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
273+
PRODUCT_BUNDLE_IDENTIFIER = info.dubsar.SettingsBundleGroupExample;
274+
PRODUCT_NAME = "$(TARGET_NAME)";
275+
SWIFT_VERSION = 3.0;
276+
};
277+
name = Debug;
278+
};
279+
7BE144EB1EE9C82100997941 /* Release */ = {
280+
isa = XCBuildConfiguration;
281+
buildSettings = {
282+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
283+
INFOPLIST_FILE = SettingsBundleGroupExample/Info.plist;
284+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
285+
PRODUCT_BUNDLE_IDENTIFIER = info.dubsar.SettingsBundleGroupExample;
286+
PRODUCT_NAME = "$(TARGET_NAME)";
287+
SWIFT_VERSION = 3.0;
288+
};
289+
name = Release;
290+
};
291+
/* End XCBuildConfiguration section */
292+
293+
/* Begin XCConfigurationList section */
294+
7BE144D21EE9C82100997941 /* Build configuration list for PBXProject "SettingsBundleGroupExample" */ = {
295+
isa = XCConfigurationList;
296+
buildConfigurations = (
297+
7BE144E71EE9C82100997941 /* Debug */,
298+
7BE144E81EE9C82100997941 /* Release */,
299+
);
300+
defaultConfigurationIsVisible = 0;
301+
defaultConfigurationName = Release;
302+
};
303+
7BE144E91EE9C82100997941 /* Build configuration list for PBXNativeTarget "SettingsBundleGroupExample" */ = {
304+
isa = XCConfigurationList;
305+
buildConfigurations = (
306+
7BE144EA1EE9C82100997941 /* Debug */,
307+
7BE144EB1EE9C82100997941 /* Release */,
308+
);
309+
defaultConfigurationIsVisible = 0;
310+
defaultConfigurationName = Release;
311+
};
312+
/* End XCConfigurationList section */
313+
};
314+
rootObject = 7BE144CF1EE9C82100997941 /* Project object */;
315+
}

0 commit comments

Comments
 (0)