@@ -177,18 +177,8 @@ public struct RswiftCore {
177
177
178
178
let projectStruct = XcodeProjectGenerator . generateProject ( developmentRegion: developmentRegion, knownAssetTags: knownAssetTags)
179
179
180
- let generateString = generators. contains ( . string) && !stringStruct. isEmpty
181
- let generateData = generators. contains ( . data) && !dataStruct. isEmpty
182
- let generateColor = generators. contains ( . color) && !colorStruct. isEmpty
183
- let generateImage = generators. contains ( . image) && !imageStruct. isEmpty
184
- let generateInfo = generators. contains ( . info) && !infoStruct. isEmpty
185
- let generateEntitlements = generators. contains ( . entitlements) && !entitlementsStruct. isEmpty
186
180
let generateFont = generators. contains ( . font) && !fontStruct. isEmpty
187
- let generateFile = generators. contains ( . file) && !fileStruct. isEmpty
188
- let generateSegue = generators. contains ( . segue) && !segueStruct. isEmpty
189
- let generateId = generators. contains ( . id) && !idStruct. isEmpty
190
181
let generateNib = generators. contains ( . nib) && !nibStruct. isEmpty
191
- let generateReuseIdentifier = generators. contains ( . reuseIdentifier) && !reuseIdentifierStruct. isEmpty
192
182
let generateStoryboard = generators. contains ( . storyboard) && !storyboardStruct. isEmpty
193
183
194
184
let validateLines = [
@@ -211,43 +201,43 @@ public struct RswiftCore {
211
201
var s = Struct ( name: structName, additionalModuleReferences: [ . rswiftResources] ) {
212
202
Init . bundle
213
203
214
- if !projectStruct. isEmpty {
204
+ if generators . contains ( . project ) , !projectStruct. isEmpty {
215
205
projectStruct
216
206
}
217
207
218
- if generateString {
208
+ if generators . contains ( . string ) , !stringStruct . isEmpty {
219
209
stringStruct. generateBundleVarGetterForString ( name: " string " )
220
210
stringStruct. generateBundleFunctionForString ( name: " string " )
221
211
stringStruct. generateLocaleFunctionForString ( name: " string " )
222
212
stringStruct. generatePreferredLanguagesFunctionForString ( name: " string " )
223
213
stringStruct
224
214
}
225
215
226
- if generateData {
216
+ if generators . contains ( . data ) , !dataStruct . isEmpty {
227
217
dataStruct. generateBundleVarGetter ( name: " data " )
228
218
dataStruct. generateBundleFunction ( name: " data " )
229
219
dataStruct
230
220
}
231
221
232
- if generateColor {
222
+ if generators . contains ( . color ) , !colorStruct . isEmpty {
233
223
colorStruct. generateBundleVarGetter ( name: " color " )
234
224
colorStruct. generateBundleFunction ( name: " color " )
235
225
colorStruct
236
226
}
237
227
238
- if generateImage {
228
+ if generators . contains ( . image ) , !imageStruct . isEmpty {
239
229
imageStruct. generateBundleVarGetter ( name: " image " )
240
230
imageStruct. generateBundleFunction ( name: " image " )
241
231
imageStruct
242
232
}
243
233
244
- if generateInfo {
234
+ if generators . contains ( . info ) , !infoStruct . isEmpty {
245
235
infoStruct. generateBundleVarGetter ( name: " info " )
246
236
infoStruct. generateBundleFunction ( name: " info " )
247
237
infoStruct
248
238
}
249
239
250
- if generateEntitlements {
240
+ if generators . contains ( . entitlements ) , !entitlementsStruct . isEmpty {
251
241
entitlementsStruct. generateLetBinding ( )
252
242
entitlementsStruct
253
243
}
@@ -258,18 +248,18 @@ public struct RswiftCore {
258
248
fontStruct
259
249
}
260
250
261
- if generateFile {
251
+ if generators . contains ( . file ) , !fileStruct . isEmpty {
262
252
fileStruct. generateBundleVarGetter ( name: " file " )
263
253
fileStruct. generateBundleFunction ( name: " file " )
264
254
fileStruct
265
255
}
266
256
267
- if generateSegue {
257
+ if generators . contains ( . segue ) , !segueStruct . isEmpty {
268
258
segueStruct. generateLetBinding ( )
269
259
segueStruct
270
260
}
271
261
272
- if generateId {
262
+ if generators . contains ( . id ) , !idStruct . isEmpty {
273
263
idStruct. generateLetBinding ( )
274
264
idStruct
275
265
}
@@ -280,7 +270,7 @@ public struct RswiftCore {
280
270
nibStruct
281
271
}
282
272
283
- if generateReuseIdentifier {
273
+ if generators . contains ( . reuseIdentifier ) , !reuseIdentifierStruct . isEmpty {
284
274
reuseIdentifierStruct. generateLetBinding ( )
285
275
reuseIdentifierStruct
286
276
}
0 commit comments