From b3b3b89c69c15f78371c06790c1a5b04f2dffa21 Mon Sep 17 00:00:00 2001 From: David Jennes Date: Mon, 8 May 2017 23:23:40 +0200 Subject: [PATCH 1/5] Remove deprecated variables --- Sources/Stencil/AssetsCatalogContext.swift | 27 +++------------------- Sources/Stencil/ColorsContext.swift | 12 ++-------- Sources/Stencil/FontsContext.swift | 11 ++------- Sources/Stencil/StoryboardsContext.swift | 21 +++-------------- Sources/Stencil/StringsContext.swift | 26 ++------------------- Tests/Resources | 2 +- 6 files changed, 13 insertions(+), 86 deletions(-) diff --git a/Sources/Stencil/AssetsCatalogContext.swift b/Sources/Stencil/AssetsCatalogContext.swift index f3c84a5..076fce3 100644 --- a/Sources/Stencil/AssetsCatalogContext.swift +++ b/Sources/Stencil/AssetsCatalogContext.swift @@ -19,39 +19,18 @@ import Foundation */ extension AssetsCatalogParser { public func stencilContext(enumName: String = "Asset") -> [String: Any] { - let images = catalogs.flatMap { justValues(entries: $1) }.sorted(by: <) - let structured = catalogs.keys.sorted(by: <).map { name -> [String: Any] in + let catalogs = self.catalogs.keys.sorted(by: <).map { name -> [String: Any] in return [ "name": name, - "assets": structure(entries: catalogs[name] ?? []) + "assets": structure(entries: self.catalogs[name] ?? []) ] } return [ - "catalogs": structured, - - // NOTE: This is a deprecated variable - "enumName": enumName, - "images": images, - "param": ["enumName": enumName] + "catalogs": catalogs ] } - private func justValues(entries: [Entry]) -> [String] { - var result = [String]() - - for entry in entries { - switch entry { - case let .group(name: _, items: items): - result += justValues(entries: items) - case let .image(name: _, value: value): - result += [value] - } - } - - return result - } - private func structure(entries: [Entry]) -> [[String: Any]] { return entries.map { entry in switch entry { diff --git a/Sources/Stencil/ColorsContext.swift b/Sources/Stencil/ColorsContext.swift index 8ccf6e1..44cc69a 100644 --- a/Sources/Stencil/ColorsContext.swift +++ b/Sources/Stencil/ColorsContext.swift @@ -27,20 +27,12 @@ extension ColorsFileParser { "red": comps[0], "green": comps[1], "blue": comps[2], - "alpha": comps[3], - - // NOTE: This is a deprecated variable - "rgba": String(hexChars[0..<8]), - "rgb": String(hexChars[0..<6]) + "alpha": comps[3] ] }).sorted { $0["name"] ?? "" < $1["name"] ?? "" } return [ - "colors": colorMap, - - // NOTE: This is a deprecated variable - "enumName": enumName, - "param": ["enumName": enumName] + "colors": colorMap ] } } diff --git a/Sources/Stencil/FontsContext.swift b/Sources/Stencil/FontsContext.swift index c01df33..71ad874 100644 --- a/Sources/Stencil/FontsContext.swift +++ b/Sources/Stencil/FontsContext.swift @@ -24,10 +24,7 @@ extension FontsFileParser { return [ "name": font.postScriptName, "path": font.filePath, - "style": font.style, - - // NOTE: This is a deprecated variable - "fontName": font.postScriptName + "style": font.style ] }.sorted { $0["fontName"] ?? "" < $1["fontName"] ?? "" } // Family @@ -38,11 +35,7 @@ extension FontsFileParser { }.sorted { $0["name"] as? String ?? "" < $1["name"] as? String ?? "" } return [ - "families": families, - - // NOTE: This is a deprecated variable - "enumName": enumName, - "param": ["enumName": enumName] + "families": families ] } } diff --git a/Sources/Stencil/StoryboardsContext.swift b/Sources/Stencil/StoryboardsContext.swift index 6f24fc0..c382c27 100644 --- a/Sources/Stencil/StoryboardsContext.swift +++ b/Sources/Stencil/StoryboardsContext.swift @@ -59,16 +59,7 @@ extension StoryboardParser { } return [ "modules": modules.sorted(), - "storyboards": storyboardsMap, - - // NOTE: This is a deprecated variable - "extraImports": modules.sorted(), - "param": [ - "sceneEnumName": sceneEnumName, - "segueEnumName": segueEnumName - ], - "sceneEnumName": sceneEnumName, - "segueEnumName": segueEnumName + "storyboards": storyboardsMap ] } @@ -80,10 +71,7 @@ extension StoryboardParser { ] } else { return [ - "baseType": uppercaseFirst(scene.tag), - - // NOTE: This is a deprecated variable - "isBaseViewController": scene.tag == "viewController" + "baseType": uppercaseFirst(scene.tag) ] } } @@ -98,10 +86,7 @@ extension StoryboardParser { } else if scene.tag == "viewController" { return [ "identifier": scene.storyboardID, - "baseType": uppercaseFirst(scene.tag), - - // NOTE: This is a deprecated variable - "isBaseViewController": scene.tag == "viewController" + "baseType": uppercaseFirst(scene.tag) ] } else { return [ diff --git a/Sources/Stencil/StringsContext.swift b/Sources/Stencil/StringsContext.swift index a97bc81..aef7ed8 100644 --- a/Sources/Stencil/StringsContext.swift +++ b/Sources/Stencil/StringsContext.swift @@ -39,23 +39,11 @@ extension StringsFileParser { var result: [String: Any] = [ "name": levelName, "key": entry.key.newlineEscaped, - "translation": entry.translation.newlineEscaped, - - // NOTE: keytail is deprecated - "keytail": levelName + "translation": entry.translation.newlineEscaped ] if entry.types.count > 0 { result["types"] = entry.types.map { $0.rawValue } - - // NOTE: params is deprecated - result["params"] = [ - "types": entry.types.map { $0.rawValue }, - "count": entry.types.count, - "declarations": entry.types.indices.map { "let p\($0)" }, - "names": entry.types.indices.map { "p\($0)" }, - "typednames": entry.types.enumerated().map { "p\($0): \($1.rawValue)" } - ] } return result @@ -74,14 +62,7 @@ extension StringsFileParser { ]] return [ - "tables": tables, - - // NOTE: These are deprecated variables - "enumName": enumName, - "param": ["enumName": enumName], - "strings": strings, - "structuredStrings": structuredStrings, - "tableName": tableName + "tables": tables ] } @@ -139,9 +120,6 @@ extension StringsFileParser { if !children.isEmpty { structuredStrings["children"] = children - - // NOTE: These are deprecated variables - structuredStrings["subenums"] = children } return structuredStrings diff --git a/Tests/Resources b/Tests/Resources index 8a8d0d1..6bb13f2 160000 --- a/Tests/Resources +++ b/Tests/Resources @@ -1 +1 @@ -Subproject commit 8a8d0d108f46f787cc5e5c2ce05fb8e1d18e0ce5 +Subproject commit 6bb13f26f4839fad95b0d707dc6abb80bf15fec1 From 740e3085e6bd9b81f93c2b43f12be1b8833154bb Mon Sep 17 00:00:00 2001 From: David Jennes Date: Mon, 8 May 2017 23:29:20 +0200 Subject: [PATCH 2/5] remove some old code --- Sources/Stencil/StringsContext.swift | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Sources/Stencil/StringsContext.swift b/Sources/Stencil/StringsContext.swift index aef7ed8..4ef0662 100644 --- a/Sources/Stencil/StringsContext.swift +++ b/Sources/Stencil/StringsContext.swift @@ -32,9 +32,7 @@ extension StringsFileParser { public func stencilContext(enumName: String = "L10n", tableName: String = "Localizable") -> [String: Any] { let entryToStringMapper = { (entry: Entry, keyPath: [String]) -> [String: Any] in - var keyStructure = entry.keyStructure - Array(0.. Date: Mon, 8 May 2017 23:55:59 +0200 Subject: [PATCH 3/5] Fix broken font sorting --- Sources/Stencil/FontsContext.swift | 2 +- Tests/Resources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Stencil/FontsContext.swift b/Sources/Stencil/FontsContext.swift index 71ad874..2e588df 100644 --- a/Sources/Stencil/FontsContext.swift +++ b/Sources/Stencil/FontsContext.swift @@ -26,7 +26,7 @@ extension FontsFileParser { "path": font.filePath, "style": font.style ] - }.sorted { $0["fontName"] ?? "" < $1["fontName"] ?? "" } + }.sorted { $0["name"] ?? "" < $1["name"] ?? "" } // Family return [ "name": name, diff --git a/Tests/Resources b/Tests/Resources index 6bb13f2..96077cc 160000 --- a/Tests/Resources +++ b/Tests/Resources @@ -1 +1 @@ -Subproject commit 6bb13f26f4839fad95b0d707dc6abb80bf15fec1 +Subproject commit 96077cc08a56906b395d1a185693b54567f9bea3 From 7d7e2c8b43d252064e86eb0c9591557c238e1bdc Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 9 May 2017 00:09:43 +0200 Subject: [PATCH 4/5] changelog entry --- CHANGELOG.md | 4 +++- Tests/Resources | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d28a94d..3d4179a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,9 @@ _None_ ### Breaking Changes -_None_ +* Removed deprecated variables. See [SwiftGenKit#5](https://github.com/SwiftGen/SwiftGenKit/issues/5) for more information. + [David Jennes](https://github.com/djbe) + [#35](https://github.com/SwiftGen/templates/issues/35) ### New Features diff --git a/Tests/Resources b/Tests/Resources index 96077cc..57d31e7 160000 --- a/Tests/Resources +++ b/Tests/Resources @@ -1 +1 @@ -Subproject commit 96077cc08a56906b395d1a185693b54567f9bea3 +Subproject commit 57d31e7422ad9e5371c01356ef75480ef99e79bb From 6757b395d35e3fadb276f33080f618133c8afa9f Mon Sep 17 00:00:00 2001 From: David Jennes Date: Thu, 11 May 2017 21:29:13 +0200 Subject: [PATCH 5/5] align submodule --- Tests/Resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Resources b/Tests/Resources index 57d31e7..2fbb558 160000 --- a/Tests/Resources +++ b/Tests/Resources @@ -1 +1 @@ -Subproject commit 57d31e7422ad9e5371c01356ef75480ef99e79bb +Subproject commit 2fbb5586cb2852e149870bf1df11b77c83380deb