Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
32 changes: 0 additions & 32 deletions AutorestSwift.xcworkspace/xcshareddata/IDETemplateMacros.plist

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/tjprescott/Yams.git", .branch("CircularReferences")),
.package(url: "https://github.com/stencilproject/Stencil.git", .branch("trim_whitespace")),
.package(url: "https://github.com/stencilproject/Stencil.git", .branch("master")),
.package(url: "https://github.com/apple/swift-nio", from: "2.0.0"),
.package(
name: "AzureCore",
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ target 'AutorestSwift' do

# Pods for AutorestSwift
pod 'Yams', :git => 'https://github.com/tjprescott/Yams.git', :branch => 'CircularReferences'
pod 'Stencil', :git => 'https://github.com/stencilproject/Stencil.git', :branch => 'trim_whitespace'
pod 'Stencil', :git => 'https://github.com/stencilproject/Stencil.git', :branch => 'master'
pod 'SwiftFormat/CLI'
pod 'SwiftLint'
pod 'SwiftNIO'
Expand Down
2 changes: 1 addition & 1 deletion src/AutorestSwift/Code Generator/SwiftGenerator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class SwiftGenerator: CodeGenerator {
try optionsUrl.ensureExists()
try utilUrl.ensureExists()
try jazzyUrl.ensureExists()
SharedLogger.info("Base URL: \(baseUrl.path)")
SharedLogger.info("Base URL: \(self.baseUrl.path)")

// Create PatchUtil.swift file
try render(
Expand Down
2 changes: 1 addition & 1 deletion src/AutorestSwift/JsonRpc/Server.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public final class ChannelServer {
name: "ServerHandler"
)
}
}.withPipes(inputDescriptor: STDIN_FILENO, outputDescriptor: STDOUT_FILENO)
}.takingOwnershipOfDescriptors(input: STDIN_FILENO, output: STDOUT_FILENO)

state = .starting
return bootstrap.eventLoop.makeSucceededFuture(self)
Expand Down
2 changes: 1 addition & 1 deletion src/AutorestSwift/Utils/StencilUtil.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import Stencil

public func renderTemplate(filename: String, dictionary: [String: Any]) throws -> String {
let fsLoader = FileSystemLoader(bundle: [Bundle.main])
let environment = Environment(loader: fsLoader, trimBehavior: TrimBehavior.smart)
let environment = Environment(loader: fsLoader, trimBehaviour: TrimBehaviour.smart)

return try environment.renderTemplate(name: filename, context: dictionary)
}