From a9cf9af919d32f59de0ec44772c2b138ec2d550e Mon Sep 17 00:00:00 2001 From: Yegor Popovych Date: Mon, 18 Apr 2016 19:24:20 +0300 Subject: [PATCH 1/5] Added minor versions for packages in Package.swift --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 92fdfdb..688f074 100644 --- a/Package.swift +++ b/Package.swift @@ -36,8 +36,8 @@ let package = Package( dependencies: [ .Package(url: "https://github.com/crossroadlabs/BrightFutures.git", majorVersion: 0, minor: 4), .Package(url: "https://github.com/crossroadlabs/TidyJSON.git", majorVersion: 1, minor: 1), - .Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0), - .Package(url: "https://github.com/crossroadlabs/Regex.git", majorVersion: 0), + .Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0, minor: 2), + .Package(url: "https://github.com/crossroadlabs/Regex.git", majorVersion: 0, minor: 5), .Package(url: "https://github.com/crossroadlabs/Stencil.git", majorVersion: 0), ] ) From 2cbc16569f3ade3af5bc0f5d19762f5b2a5387df Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Sat, 1 Apr 2017 23:32:29 +0300 Subject: [PATCH 2/5] Better Demo project structure --- .../Demo => }/public/css/bootstrap-theme.min.css | 0 .../{Sources/Demo => }/public/css/bootstrap.min.css | 0 Demo/{Sources/Demo => }/public/css/main.css | 0 Demo/{Sources/Demo => }/public/css/xcode.css | 0 .../public/fonts/glyphicons-halflings-regular.eot | Bin .../public/fonts/glyphicons-halflings-regular.svg | 0 .../public/fonts/glyphicons-halflings-regular.ttf | Bin .../public/fonts/glyphicons-halflings-regular.woff | Bin .../public/fonts/glyphicons-halflings-regular.woff2 | Bin Demo/{Sources/Demo => }/public/js/bootstrap.min.js | 0 Demo/{Sources/Demo => }/public/js/highlight.pack.js | 0 Demo/{Sources/Demo => }/public/js/jquery.min.js | 0 Demo/{Sources/Demo => }/public/logo.png | Bin Demo/{Sources/Demo => }/views/404.stencil | 0 Demo/{Sources/Demo => }/views/code/404.stencil | 0 .../Demo => }/views/code/echo-param.stencil | 0 Demo/{Sources/Demo => }/views/code/echo.stencil | 0 Demo/{Sources/Demo => }/views/code/error.stencil | 0 .../{Sources/Demo => }/views/code/factorial.stencil | 0 .../Demo => }/views/code/hello-user.stencil | 0 Demo/{Sources/Demo => }/views/code/hello.stencil | 0 Demo/{Sources/Demo => }/views/code/query.stencil | 0 Demo/{Sources/Demo => }/views/code/redirect.stencil | 0 Demo/{Sources/Demo => }/views/code/render.stencil | 0 Demo/{Sources/Demo => }/views/colored.stencil | 0 Demo/{Sources/Demo => }/views/css.stencil | 0 .../Demo => }/views/error-recovered.stencil | 0 Demo/{Sources/Demo => }/views/hello.stencil | 0 Demo/{Sources/Demo => }/views/index.stencil | 0 Demo/{Sources/Demo => }/views/js.stencil | 0 Demo/{Sources/Demo => }/views/mustache.mustache | 0 Demo/{Sources/Demo => }/views/test.stencil | 0 32 files changed, 0 insertions(+), 0 deletions(-) rename Demo/{Sources/Demo => }/public/css/bootstrap-theme.min.css (100%) rename Demo/{Sources/Demo => }/public/css/bootstrap.min.css (100%) rename Demo/{Sources/Demo => }/public/css/main.css (100%) rename Demo/{Sources/Demo => }/public/css/xcode.css (100%) rename Demo/{Sources/Demo => }/public/fonts/glyphicons-halflings-regular.eot (100%) rename Demo/{Sources/Demo => }/public/fonts/glyphicons-halflings-regular.svg (100%) rename Demo/{Sources/Demo => }/public/fonts/glyphicons-halflings-regular.ttf (100%) rename Demo/{Sources/Demo => }/public/fonts/glyphicons-halflings-regular.woff (100%) rename Demo/{Sources/Demo => }/public/fonts/glyphicons-halflings-regular.woff2 (100%) rename Demo/{Sources/Demo => }/public/js/bootstrap.min.js (100%) rename Demo/{Sources/Demo => }/public/js/highlight.pack.js (100%) rename Demo/{Sources/Demo => }/public/js/jquery.min.js (100%) rename Demo/{Sources/Demo => }/public/logo.png (100%) rename Demo/{Sources/Demo => }/views/404.stencil (100%) rename Demo/{Sources/Demo => }/views/code/404.stencil (100%) rename Demo/{Sources/Demo => }/views/code/echo-param.stencil (100%) rename Demo/{Sources/Demo => }/views/code/echo.stencil (100%) rename Demo/{Sources/Demo => }/views/code/error.stencil (100%) rename Demo/{Sources/Demo => }/views/code/factorial.stencil (100%) rename Demo/{Sources/Demo => }/views/code/hello-user.stencil (100%) rename Demo/{Sources/Demo => }/views/code/hello.stencil (100%) rename Demo/{Sources/Demo => }/views/code/query.stencil (100%) rename Demo/{Sources/Demo => }/views/code/redirect.stencil (100%) rename Demo/{Sources/Demo => }/views/code/render.stencil (100%) rename Demo/{Sources/Demo => }/views/colored.stencil (100%) rename Demo/{Sources/Demo => }/views/css.stencil (100%) rename Demo/{Sources/Demo => }/views/error-recovered.stencil (100%) rename Demo/{Sources/Demo => }/views/hello.stencil (100%) rename Demo/{Sources/Demo => }/views/index.stencil (100%) rename Demo/{Sources/Demo => }/views/js.stencil (100%) rename Demo/{Sources/Demo => }/views/mustache.mustache (100%) rename Demo/{Sources/Demo => }/views/test.stencil (100%) diff --git a/Demo/Sources/Demo/public/css/bootstrap-theme.min.css b/Demo/public/css/bootstrap-theme.min.css similarity index 100% rename from Demo/Sources/Demo/public/css/bootstrap-theme.min.css rename to Demo/public/css/bootstrap-theme.min.css diff --git a/Demo/Sources/Demo/public/css/bootstrap.min.css b/Demo/public/css/bootstrap.min.css similarity index 100% rename from Demo/Sources/Demo/public/css/bootstrap.min.css rename to Demo/public/css/bootstrap.min.css diff --git a/Demo/Sources/Demo/public/css/main.css b/Demo/public/css/main.css similarity index 100% rename from Demo/Sources/Demo/public/css/main.css rename to Demo/public/css/main.css diff --git a/Demo/Sources/Demo/public/css/xcode.css b/Demo/public/css/xcode.css similarity index 100% rename from Demo/Sources/Demo/public/css/xcode.css rename to Demo/public/css/xcode.css diff --git a/Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.eot b/Demo/public/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.eot rename to Demo/public/fonts/glyphicons-halflings-regular.eot diff --git a/Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.svg b/Demo/public/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.svg rename to Demo/public/fonts/glyphicons-halflings-regular.svg diff --git a/Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.ttf b/Demo/public/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.ttf rename to Demo/public/fonts/glyphicons-halflings-regular.ttf diff --git a/Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.woff b/Demo/public/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.woff rename to Demo/public/fonts/glyphicons-halflings-regular.woff diff --git a/Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.woff2 b/Demo/public/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from Demo/Sources/Demo/public/fonts/glyphicons-halflings-regular.woff2 rename to Demo/public/fonts/glyphicons-halflings-regular.woff2 diff --git a/Demo/Sources/Demo/public/js/bootstrap.min.js b/Demo/public/js/bootstrap.min.js similarity index 100% rename from Demo/Sources/Demo/public/js/bootstrap.min.js rename to Demo/public/js/bootstrap.min.js diff --git a/Demo/Sources/Demo/public/js/highlight.pack.js b/Demo/public/js/highlight.pack.js similarity index 100% rename from Demo/Sources/Demo/public/js/highlight.pack.js rename to Demo/public/js/highlight.pack.js diff --git a/Demo/Sources/Demo/public/js/jquery.min.js b/Demo/public/js/jquery.min.js similarity index 100% rename from Demo/Sources/Demo/public/js/jquery.min.js rename to Demo/public/js/jquery.min.js diff --git a/Demo/Sources/Demo/public/logo.png b/Demo/public/logo.png similarity index 100% rename from Demo/Sources/Demo/public/logo.png rename to Demo/public/logo.png diff --git a/Demo/Sources/Demo/views/404.stencil b/Demo/views/404.stencil similarity index 100% rename from Demo/Sources/Demo/views/404.stencil rename to Demo/views/404.stencil diff --git a/Demo/Sources/Demo/views/code/404.stencil b/Demo/views/code/404.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/404.stencil rename to Demo/views/code/404.stencil diff --git a/Demo/Sources/Demo/views/code/echo-param.stencil b/Demo/views/code/echo-param.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/echo-param.stencil rename to Demo/views/code/echo-param.stencil diff --git a/Demo/Sources/Demo/views/code/echo.stencil b/Demo/views/code/echo.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/echo.stencil rename to Demo/views/code/echo.stencil diff --git a/Demo/Sources/Demo/views/code/error.stencil b/Demo/views/code/error.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/error.stencil rename to Demo/views/code/error.stencil diff --git a/Demo/Sources/Demo/views/code/factorial.stencil b/Demo/views/code/factorial.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/factorial.stencil rename to Demo/views/code/factorial.stencil diff --git a/Demo/Sources/Demo/views/code/hello-user.stencil b/Demo/views/code/hello-user.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/hello-user.stencil rename to Demo/views/code/hello-user.stencil diff --git a/Demo/Sources/Demo/views/code/hello.stencil b/Demo/views/code/hello.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/hello.stencil rename to Demo/views/code/hello.stencil diff --git a/Demo/Sources/Demo/views/code/query.stencil b/Demo/views/code/query.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/query.stencil rename to Demo/views/code/query.stencil diff --git a/Demo/Sources/Demo/views/code/redirect.stencil b/Demo/views/code/redirect.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/redirect.stencil rename to Demo/views/code/redirect.stencil diff --git a/Demo/Sources/Demo/views/code/render.stencil b/Demo/views/code/render.stencil similarity index 100% rename from Demo/Sources/Demo/views/code/render.stencil rename to Demo/views/code/render.stencil diff --git a/Demo/Sources/Demo/views/colored.stencil b/Demo/views/colored.stencil similarity index 100% rename from Demo/Sources/Demo/views/colored.stencil rename to Demo/views/colored.stencil diff --git a/Demo/Sources/Demo/views/css.stencil b/Demo/views/css.stencil similarity index 100% rename from Demo/Sources/Demo/views/css.stencil rename to Demo/views/css.stencil diff --git a/Demo/Sources/Demo/views/error-recovered.stencil b/Demo/views/error-recovered.stencil similarity index 100% rename from Demo/Sources/Demo/views/error-recovered.stencil rename to Demo/views/error-recovered.stencil diff --git a/Demo/Sources/Demo/views/hello.stencil b/Demo/views/hello.stencil similarity index 100% rename from Demo/Sources/Demo/views/hello.stencil rename to Demo/views/hello.stencil diff --git a/Demo/Sources/Demo/views/index.stencil b/Demo/views/index.stencil similarity index 100% rename from Demo/Sources/Demo/views/index.stencil rename to Demo/views/index.stencil diff --git a/Demo/Sources/Demo/views/js.stencil b/Demo/views/js.stencil similarity index 100% rename from Demo/Sources/Demo/views/js.stencil rename to Demo/views/js.stencil diff --git a/Demo/Sources/Demo/views/mustache.mustache b/Demo/views/mustache.mustache similarity index 100% rename from Demo/Sources/Demo/views/mustache.mustache rename to Demo/views/mustache.mustache diff --git a/Demo/Sources/Demo/views/test.stencil b/Demo/views/test.stencil similarity index 100% rename from Demo/Sources/Demo/views/test.stencil rename to Demo/views/test.stencil From 0c533a88c68178852fed564c17874a6ee2808f6e Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Sat, 1 Apr 2017 23:35:09 +0300 Subject: [PATCH 3/5] Better project structure --- Demo/Sources/{Demo => app}/main.swift | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Demo/Sources/{Demo => app}/main.swift (100%) diff --git a/Demo/Sources/Demo/main.swift b/Demo/Sources/app/main.swift similarity index 100% rename from Demo/Sources/Demo/main.swift rename to Demo/Sources/app/main.swift From 6dcdab64be3233ed2e63f03ffa84f674ed4ed142 Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Mon, 3 Apr 2017 01:30:58 +0300 Subject: [PATCH 4/5] Bumped GRMustache version --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index f7ea14e..e133af8 100644 --- a/Package.swift +++ b/Package.swift @@ -28,7 +28,7 @@ let package = Package( .Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", majorVersion: 15), .Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0, minor: 4), .Package(url: "https://github.com/kylef/Stencil.git", majorVersion: 0, minor: 8), - .Package(url: "https://github.com/IBM-Swift/GRMustache.swift", majorVersion: 1, minor: 5), + .Package(url: "https://github.com/IBM-Swift/GRMustache.swift", majorVersion: 1, minor: 7), .Package(url: "https://github.com/crossroadlabs/CEVHTP.git", majorVersion: 0, minor: 4), ] ) From 956139ff4dd4a1d8bc30e6d6b53ddb045e4f4c75 Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Mon, 3 Apr 2017 01:36:36 +0300 Subject: [PATCH 5/5] Bumped SwiftyJSON version --- Package.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index e133af8..2d38e96 100644 --- a/Package.swift +++ b/Package.swift @@ -24,11 +24,11 @@ import PackageDescription let package = Package( name: "Express", dependencies: [ - .Package(url: "https://github.com/reactive-swift/Future.git", majorVersion: 0, minor: 2), - .Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", majorVersion: 15), - .Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0, minor: 4), - .Package(url: "https://github.com/kylef/Stencil.git", majorVersion: 0, minor: 8), + .Package(url: "https://github.com/reactive-swift/Future.git", majorVersion: 0, minor: 2), + .Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", majorVersion: 16), + .Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0, minor: 4), + .Package(url: "https://github.com/kylef/Stencil.git", majorVersion: 0, minor: 8), .Package(url: "https://github.com/IBM-Swift/GRMustache.swift", majorVersion: 1, minor: 7), - .Package(url: "https://github.com/crossroadlabs/CEVHTP.git", majorVersion: 0, minor: 4), + .Package(url: "https://github.com/crossroadlabs/CEVHTP.git", majorVersion: 0, minor: 4), ] )