Skip to content

Commit 24d82d0

Browse files
author
Dominik Hadl
committed
Update for new model generator
1 parent 0c3624e commit 24d82d0

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "nodes-ios/model-generator" "master"
1+
github "nodes-ios/model-generator" ~> 1.0
22

Cartfile.resolved

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
github "jatoben/CommandLine" "7a5502c068512b67c3711968ae7f6a3fa71f1ca9"
2-
github "nodes-ios/model-generator" "06d9aa994e5773c01330552b10880768ed31e9e7"
1+
github "nodes-ios/model-generator" "1.0.0"

nstack-translations-generator/Classes/TranslationsGenerator/Downloader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct Downloader {
6363
self.semaphore.signal()
6464
}.resume()
6565

66-
semaphore.wait(timeout: DispatchTime.distantFuture)
66+
_ = semaphore.wait(timeout: DispatchTime.distantFuture)
6767

6868
if let error = finalError {
6969
throw error

nstack-translations-generator/Classes/TranslationsGenerator/Generator.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct Generator {
103103

104104
indent = indent.previousLevel()
105105

106-
let extensionString = try ModelGenerator.modelCodeFromSourceCode(modelString + "}", withSettings: self.generatorSettings)
106+
let extensionString = try ModelGenerator.modelCode(fromSourceCode: modelString + "}", withSettings: self.generatorSettings)
107107

108108
if let subModels = subModels {
109109
modelString += subModels + "\n"
@@ -143,7 +143,7 @@ struct Generator {
143143
settings.moduleName = self.modelName
144144

145145
extensionsString += "\n\n"
146-
extensionsString += try ModelGenerator.modelCodeFromSourceCode(subString, withSettings: settings)
146+
extensionsString += try ModelGenerator.modelCode(fromSourceCode: subString, withSettings: settings)
147147
}
148148

149149
return (modelsString, extensionsString)

0 commit comments

Comments
 (0)