From 46209cc31c70d588f75fbb36067df4f200e6998e Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Sat, 12 Aug 2017 18:37:51 +0200 Subject: [PATCH] pod update --- Gemfile | 2 +- Gemfile.lock | 14 +- Podfile.lock | 8 +- .../StencilSwiftKit.podspec.json | 4 +- Pods/Manifest.lock | 8 +- Pods/Pods.xcodeproj/project.pbxproj | 120 +++++++++--------- Pods/StencilSwiftKit/README.md | 9 +- Pods/StencilSwiftKit/Sources/Context.swift | 3 +- .../Sources/SwiftIdentifier.swift | 2 +- .../Pods-Tests/Pods-Tests-frameworks.sh | 33 +++-- .../Pods-Tests/Pods-Tests-resources.sh | 22 ++-- .../StencilSwiftKit/Info.plist | 2 +- Templates.xcodeproj/project.pbxproj | 12 +- 13 files changed, 136 insertions(+), 103 deletions(-) diff --git a/Gemfile b/Gemfile index 28ee9c9..13d8ba2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -gem 'cocoapods', '1.2.1' +gem 'cocoapods', '1.3.1' gem 'xcpretty' gem 'rake' gem 'octokit', '~> 4.7' diff --git a/Gemfile.lock b/Gemfile.lock index cbeafa6..b07be50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,10 +10,10 @@ GEM addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) claide (1.0.2) - cocoapods (1.2.1) + cocoapods (1.3.1) activesupport (>= 4.0.2, < 5) - claide (>= 1.0.1, < 2.0) - cocoapods-core (= 1.2.1) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.3.1) cocoapods-deintegrate (>= 1.0.1, < 2.0) cocoapods-downloader (>= 1.1.3, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,9 +28,9 @@ GEM molinillo (~> 0.5.7) nap (~> 1.0) ruby-macho (~> 1.1) - xcodeproj (>= 1.4.4, < 2.0) - cocoapods-core (1.2.1) - activesupport (>= 4.0.2, < 5) + xcodeproj (>= 1.5.1, < 2.0) + cocoapods-core (1.3.1) + activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.1) @@ -81,7 +81,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.2.1) + cocoapods (= 1.3.1) octokit (~> 4.7) rake xcpretty diff --git a/Podfile.lock b/Podfile.lock index 7cd6592..ff08fe4 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -2,7 +2,7 @@ PODS: - PathKit (0.8.0) - Stencil (0.9.0): - PathKit (~> 0.8.0) - - StencilSwiftKit (1.0.2): + - StencilSwiftKit (2.0.1): - Stencil (~> 0.9.0) DEPENDENCIES: @@ -15,14 +15,14 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: StencilSwiftKit: - :commit: 4a73848c371c1c356f56462523c6f073d2389e4d + :commit: 695b6bfd3f0f54cec5b96d65783f98c3edd9a81c :git: https://github.com/SwiftGen/StencilSwiftKit SPEC CHECKSUMS: PathKit: dcab05d701474011aae0e40cf892298a831f63d6 Stencil: 510f0b0518a366b67b6a9c5085a0399741b6d2f9 - StencilSwiftKit: 6d5b0c7fbb185edb24617fdd63ab0d9938569c8a + StencilSwiftKit: b7f4de5ecd88c484713883d83968da8b6cc3ff97 PODFILE CHECKSUM: 910aa7b4b6bcbe527b3b6800c8fe6bc374027140 -COCOAPODS: 1.2.1 +COCOAPODS: 1.3.1 diff --git a/Pods/Local Podspecs/StencilSwiftKit.podspec.json b/Pods/Local Podspecs/StencilSwiftKit.podspec.json index 52a6ca2..0c350c4 100644 --- a/Pods/Local Podspecs/StencilSwiftKit.podspec.json +++ b/Pods/Local Podspecs/StencilSwiftKit.podspec.json @@ -1,6 +1,6 @@ { "name": "StencilSwiftKit", - "version": "1.0.2", + "version": "2.0.1", "summary": "Stencil additions dedicated for Swift code generation", "description": "This pod contains some additional nodes and filters for\n[Stencil](https://github.com/kylef/Stencil).\nThese additional nodes & filters are mainly dedicated\nfor writing Stencil templates generating *Swift* code.", "homepage": "https://github.com/SwiftGen/StencilSwiftKit", @@ -14,7 +14,7 @@ }, "source": { "git": "https://github.com/SwiftGen/StencilSwiftKit.git", - "tag": "1.0.2" + "tag": "2.0.1" }, "source_files": "Sources/**/*.swift", "dependencies": { diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 7cd6592..ff08fe4 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -2,7 +2,7 @@ PODS: - PathKit (0.8.0) - Stencil (0.9.0): - PathKit (~> 0.8.0) - - StencilSwiftKit (1.0.2): + - StencilSwiftKit (2.0.1): - Stencil (~> 0.9.0) DEPENDENCIES: @@ -15,14 +15,14 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: StencilSwiftKit: - :commit: 4a73848c371c1c356f56462523c6f073d2389e4d + :commit: 695b6bfd3f0f54cec5b96d65783f98c3edd9a81c :git: https://github.com/SwiftGen/StencilSwiftKit SPEC CHECKSUMS: PathKit: dcab05d701474011aae0e40cf892298a831f63d6 Stencil: 510f0b0518a366b67b6a9c5085a0399741b6d2f9 - StencilSwiftKit: 6d5b0c7fbb185edb24617fdd63ab0d9938569c8a + StencilSwiftKit: b7f4de5ecd88c484713883d83968da8b6cc3ff97 PODFILE CHECKSUM: 910aa7b4b6bcbe527b3b6800c8fe6bc374027140 -COCOAPODS: 1.2.1 +COCOAPODS: 1.3.1 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 6d33c7d..f5be834 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -680,7 +680,7 @@ }; name = Release; }; - 1E4274CE027E27B68E8A2409ECC010BA /* Debug */ = { + 1ACCC5D7D6798FE768B014D3BD3B5D97 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -724,13 +724,14 @@ ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; }; - 2ACDBD4D600D489385D874D15E9EC43E /* Release */ = { + 2DD46580A7EF8CF0A97B1115C3549D48 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AD0088303CC9E27CBA3792811C4E0D72 /* Stencil.xcconfig */; + baseConfigurationReference = 1A5837A27CC6BED220F6A042181C9FBD /* StencilSwiftKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -738,7 +739,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -746,22 +747,23 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/Stencil/Stencil-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Stencil/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/StencilSwiftKit/StencilSwiftKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/StencilSwiftKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/Stencil/Stencil.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = Stencil; + MODULEMAP_FILE = "Target Support Files/StencilSwiftKit/StencilSwiftKit.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = StencilSwiftKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; 33B3BE105F5DBCDCD17F015D6254D0A0 /* Debug */ = { isa = XCBuildConfiguration; @@ -803,9 +805,9 @@ }; name = Debug; }; - 54A7E44A525FC9985908E07809228B0B /* Release */ = { + 3CC944B3767E7C216F10A678A0406E61 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1A5837A27CC6BED220F6A042181C9FBD /* StencilSwiftKit.xcconfig */; + baseConfigurationReference = 6B02A6189C193869E6C629AF0B0D6B21 /* PathKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -821,16 +823,17 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/StencilSwiftKit/StencilSwiftKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/StencilSwiftKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/PathKit/PathKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/PathKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/StencilSwiftKit/StencilSwiftKit.modulemap"; + MODULEMAP_FILE = "Target Support Files/PathKit/PathKit.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = StencilSwiftKit; + PRODUCT_NAME = PathKit; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; @@ -838,9 +841,9 @@ }; name = Release; }; - 6A98ACBBC37771BBB7C42F249A130C5F /* Debug */ = { + 64A10FD6C36A126CD96F8A9D4B70781E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1A5837A27CC6BED220F6A042181C9FBD /* StencilSwiftKit.xcconfig */; + baseConfigurationReference = 6B02A6189C193869E6C629AF0B0D6B21 /* PathKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -856,17 +859,17 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/StencilSwiftKit/StencilSwiftKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/StencilSwiftKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/PathKit/PathKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/PathKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/StencilSwiftKit/StencilSwiftKit.modulemap"; + MODULEMAP_FILE = "Target Support Files/PathKit/PathKit.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = StencilSwiftKit; + PRODUCT_NAME = PathKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; @@ -874,9 +877,9 @@ }; name = Debug; }; - 70D9A4D7F24EF93AAE7ED5EF25390FA8 /* Release */ = { + 821BCF6AA937CC249FA948F0641DA144 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6B02A6189C193869E6C629AF0B0D6B21 /* PathKit.xcconfig */; + baseConfigurationReference = AD0088303CC9E27CBA3792811C4E0D72 /* Stencil.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -884,7 +887,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -892,22 +895,23 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/PathKit/PathKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/PathKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/Stencil/Stencil-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/Stencil/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/PathKit/PathKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = PathKit; + MODULEMAP_FILE = "Target Support Files/Stencil/Stencil.modulemap"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = Stencil; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; 942AC53C7B2DCEB056B940CB54173A59 /* Release */ = { isa = XCBuildConfiguration; @@ -948,9 +952,9 @@ }; name = Release; }; - BF556E721CEDA8E54F847C9C0AD90271 /* Debug */ = { + 9E4CBD963109B9015F7FEEBC006EE5A3 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6B02A6189C193869E6C629AF0B0D6B21 /* PathKit.xcconfig */; + baseConfigurationReference = 1A5837A27CC6BED220F6A042181C9FBD /* StencilSwiftKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -958,7 +962,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -966,25 +970,25 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_VERSION = A; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/PathKit/PathKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/PathKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/StencilSwiftKit/StencilSwiftKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/StencilSwiftKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/PathKit/PathKit.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = PathKit; + MODULEMAP_FILE = "Target Support Files/StencilSwiftKit/StencilSwiftKit.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = StencilSwiftKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - D81844D8F579BC7587720C84DDF1DAF1 /* Debug */ = { + B06E1FC4495AA1E0556B8CFA530F7398 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = AD0088303CC9E27CBA3792811C4E0D72 /* Stencil.xcconfig */; buildSettings = { @@ -994,7 +998,7 @@ "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1008,17 +1012,17 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; MODULEMAP_FILE = "Target Support Files/Stencil/Stencil.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; + MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = Stencil; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; /* End XCBuildConfiguration section */ @@ -1026,8 +1030,8 @@ 129C5DBD1F855F49F876BF6123ACCEA1 /* Build configuration list for PBXNativeTarget "StencilSwiftKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 6A98ACBBC37771BBB7C42F249A130C5F /* Debug */, - 54A7E44A525FC9985908E07809228B0B /* Release */, + 2DD46580A7EF8CF0A97B1115C3549D48 /* Debug */, + 9E4CBD963109B9015F7FEEBC006EE5A3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1035,8 +1039,8 @@ 16979C34640D48A0B74CB98481EF3159 /* Build configuration list for PBXNativeTarget "Stencil" */ = { isa = XCConfigurationList; buildConfigurations = ( - D81844D8F579BC7587720C84DDF1DAF1 /* Debug */, - 2ACDBD4D600D489385D874D15E9EC43E /* Release */, + 821BCF6AA937CC249FA948F0641DA144 /* Debug */, + B06E1FC4495AA1E0556B8CFA530F7398 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1044,8 +1048,8 @@ 23F10DCF4CC19FAEB872F3FF8C874D18 /* Build configuration list for PBXNativeTarget "PathKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - BF556E721CEDA8E54F847C9C0AD90271 /* Debug */, - 70D9A4D7F24EF93AAE7ED5EF25390FA8 /* Release */, + 64A10FD6C36A126CD96F8A9D4B70781E /* Debug */, + 3CC944B3767E7C216F10A678A0406E61 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1062,7 +1066,7 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1E4274CE027E27B68E8A2409ECC010BA /* Debug */, + 1ACCC5D7D6798FE768B014D3BD3B5D97 /* Debug */, 0154966AF4642F58BAA25A36C582C062 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Pods/StencilSwiftKit/README.md b/Pods/StencilSwiftKit/README.md index 0b784c6..9dce049 100644 --- a/Pods/StencilSwiftKit/README.md +++ b/Pods/StencilSwiftKit/README.md @@ -25,12 +25,13 @@ ## Filters * [String filters](Documentation/filters-strings.md): - * `escapeReservedKeywords`: Escape keywods reserved in the Swift language, by wrapping them inside backticks so that the can be used as regular escape keywords in Swift code. - * `lowerFirstWord` - * `snakeToCamelCase`: Transforms text from snake_case to camelCase. By default it keeps leading underscores, unless a single optional argument is set to "true", "yes" or "1". * `camelToSnakeCase`: Transforms text from camelCase to snake_case. By default it converts to lower case, unless a single optional argument is set to "false", "no" or "0". + * `escapeReservedKeywords`: Escape keywords reserved in the Swift language, by wrapping them inside backticks so that the can be used as regular escape keywords in Swift code. + * `lowerFirstWord`: Lowercases only the first word of a string. + * `removeNewlines`: Removes newlines and other whitespace characters, depending on the mode ("all" or "leading"). + * `snakeToCamelCase`: Transforms text from snake_case to camelCase. By default it keeps leading underscores, unless a single optional argument is set to "true", "yes" or "1". * `swiftIdentifier`: Transforms an arbitrary string into a valid Swift identifier (using only valid characters for a Swift identifier as defined in the Swift language reference) - * `titlecase` + * `titlecase`: Uppercases only the first character * [Number filters](Documentation/filters-numbers.md): * `int255toFloat` * `hexToInt` diff --git a/Pods/StencilSwiftKit/Sources/Context.swift b/Pods/StencilSwiftKit/Sources/Context.swift index 3e70c67..80e4cdd 100644 --- a/Pods/StencilSwiftKit/Sources/Context.swift +++ b/Pods/StencilSwiftKit/Sources/Context.swift @@ -22,7 +22,8 @@ public enum StencilContext { /// - Throws: `Parameters.Error` public static func enrich(context: [String: Any], parameters: [String], - environment: [String: String] = ProcessInfo().environment) throws -> [String: Any] { + environment: [String: String] = + ProcessInfo.processInfo.environment) throws -> [String: Any] { var context = context context[environmentKey] = merge(context[environmentKey], with: environment) diff --git a/Pods/StencilSwiftKit/Sources/SwiftIdentifier.swift b/Pods/StencilSwiftKit/Sources/SwiftIdentifier.swift index 654b98f..68d9e5e 100644 --- a/Pods/StencilSwiftKit/Sources/SwiftIdentifier.swift +++ b/Pods/StencilSwiftKit/Sources/SwiftIdentifier.swift @@ -69,7 +69,7 @@ func swiftIdentifier(from string: String, let mappedParts = parts.map({ (string: String) -> String in // Can't use capitalizedString here because it will lowercase all letters after the first // e.g. "SomeNiceIdentifier".capitalizedString will because "Someniceidentifier" which is not what we want - let ns = string as NSString + let ns = NSString(string: string) if ns.length > 0 { let firstLetter = ns.substring(to: 1) let rest = ns.substring(from: 1) diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh b/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh index d5d3553..7db3424 100755 --- a/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh +++ b/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh @@ -6,6 +6,10 @@ mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -23,9 +27,9 @@ install_framework() source="$(readlink "${source}")" fi - # use filter instead of exclude so missing patterns dont' throw errors - echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + # Use filter instead of exclude so missing patterns don't throw errors. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -54,6 +58,15 @@ install_framework() fi } +# Copies the dSYM of a vendored framework +install_dsym() { + local source="$1" + if [ -r "$source" ]; then + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + fi +} + # Signs a framework with the provided identity code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then @@ -76,7 +89,7 @@ strip_invalid_archs() { archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" stripped="" for arch in $archs; do - if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then + if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 stripped="$stripped $arch" @@ -89,14 +102,14 @@ strip_invalid_archs() { if [[ "$CONFIGURATION" == "Debug" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/PathKit/PathKit.framework" - install_framework "$BUILT_PRODUCTS_DIR/Stencil/Stencil.framework" - install_framework "$BUILT_PRODUCTS_DIR/StencilSwiftKit/StencilSwiftKit.framework" + install_framework "${BUILT_PRODUCTS_DIR}/PathKit/PathKit.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Stencil/Stencil.framework" + install_framework "${BUILT_PRODUCTS_DIR}/StencilSwiftKit/StencilSwiftKit.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_framework "$BUILT_PRODUCTS_DIR/PathKit/PathKit.framework" - install_framework "$BUILT_PRODUCTS_DIR/Stencil/Stencil.framework" - install_framework "$BUILT_PRODUCTS_DIR/StencilSwiftKit/StencilSwiftKit.framework" + install_framework "${BUILT_PRODUCTS_DIR}/PathKit/PathKit.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Stencil/Stencil.framework" + install_framework "${BUILT_PRODUCTS_DIR}/StencilSwiftKit/StencilSwiftKit.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh b/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh index aed060f..a7df440 100755 --- a/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh +++ b/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh @@ -8,6 +8,10 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt XCASSET_FILES=() +# This protects against multiple targets copying the same framework dependency at the same time. The solution +# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html +RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") + case "${TARGETED_DEVICE_FAMILY}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" @@ -44,29 +48,29 @@ EOM fi case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" || true ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" || true + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" || true xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" || true xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) @@ -74,7 +78,7 @@ EOM XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) - echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" || true echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac diff --git a/Pods/Target Support Files/StencilSwiftKit/Info.plist b/Pods/Target Support Files/StencilSwiftKit/Info.plist index b35ab35..bdac57c 100644 --- a/Pods/Target Support Files/StencilSwiftKit/Info.plist +++ b/Pods/Target Support Files/StencilSwiftKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.2 + 2.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Templates.xcodeproj/project.pbxproj b/Templates.xcodeproj/project.pbxproj index bd91401..d4826f8 100644 --- a/Templates.xcodeproj/project.pbxproj +++ b/Templates.xcodeproj/project.pbxproj @@ -192,13 +192,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Tests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; DD3EE1BB1E65E43E00EA1599 /* ⚠️ SwiftLint */ = { @@ -221,9 +224,16 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/PathKit/PathKit.framework", + "${BUILT_PRODUCTS_DIR}/Stencil/Stencil.framework", + "${BUILT_PRODUCTS_DIR}/StencilSwiftKit/StencilSwiftKit.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PathKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stencil.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StencilSwiftKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh;