Merge branch 'develop'

mac-cain13 · Jan 21, 2015 · 5cd5ac4 · 5cd5ac4
2 parents 0da8066 + 929ae2e
commit 5cd5ac4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/R.swift/func.swift b/R.swift/func.swift
@@ -139,6 +139,10 @@ func writeResourceFile(code: String, toFolderURL folderURL: NSURL) {
 
 // MARK: Code generator functions
 
+func swiftImports() -> String {
+    return "import UIKit"
+}
+
 func swiftImageStructWithAssetFolders(assetFolders: [AssetFolder]) -> String {
   return distinct(assetFolders.flatMap { $0.imageAssets })
     .reduce("struct image {\n") {

diff --git a/R.swift/main.swift b/R.swift/main.swift
@@ -15,6 +15,9 @@ let findAllStoryboardURLsInDirectory = filterDirectoryContentsRecursively(defaul
 
 inputDirectories(NSProcessInfo.processInfo())
   .each { directory in
+    // Imports
+    let imports = swiftImports()
+
     // Storyboards
     let storyboards = findAllStoryboardURLsInDirectory(url: directory)
       .map { Storyboard(url: $0) }
@@ -37,6 +40,6 @@ inputDirectories(NSProcessInfo.processInfo())
 
     // Write out the code
     let code = [imageStruct, segueStruct, storyboardStructs, validateAllStoryboardsFunction]
-      .reduce("struct R {") { $0 + "\n" + indent(string: $1) } + "}\n"
+      .reduce("\(imports)\n\nstruct R {") { $0 + "\n" + indent(string: $1) } + "}\n"
     writeResourceFile(code, toFolderURL: directory)
   }