From 8699be59858bb8ead4e6e8a67b2d146a01c2c27c Mon Sep 17 00:00:00 2001 From: Michiel Stornebrink Date: Fri, 18 Jan 2019 11:06:14 +0100 Subject: [PATCH] Update prototype framework version to latest release v1.1.0 --- ReleaseNotes.md | 3 +-- src/Ampersand/Misc/Options.hs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 2e6988aced..75cc264f3f 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,8 +1,7 @@ # Release notes of Ampersand ## Unreleased changes -**!!Before release, do a release of the prototype framework and set option zwolleVersion to this release tag** -* Update prototype framework. See [releases](https://github.com/AmpersandTarski/Prototype/releases) for more information +* Update prototype framework to v1.1.0. See [releases](https://github.com/AmpersandTarski/Prototype/releases) for more information * Add 'public' folder in prototype directory to better distinguish between public and non-public scripts. If used, requires change in 'customizations' folder * [Issue #616](https://github.com/AmpersandTarski/Ampersand/issues/616) Add missing TType 'Object' to parser * [Issue #792](https://github.com/AmpersandTarski/Ampersand/issues/792) Add possibility to extend TXT in interfaces diff --git a/src/Ampersand/Misc/Options.hs b/src/Ampersand/Misc/Options.hs index a26ec6f51d..d843d2f151 100644 --- a/src/Ampersand/Misc/Options.hs +++ b/src/Ampersand/Misc/Options.hs @@ -209,7 +209,7 @@ getOptions' envOpts = , outputfile = fatal "No monadic options available." , dirPrototype = fromMaybe "." (envDirPrototype envOpts) (takeBaseName (fromMaybe "" fName)) <.> ".proto" , dirSource = takeDirectory $ fromMaybe "/" fName - , zwolleVersion = "development" + , zwolleVersion = "v1.1.0" , forceReinstallFramework = False , dirCustomizations = ["customizations"] , dbName = fmap toLower . fromMaybe ("ampersand_" ++ takeBaseName (fromMaybe "prototype" fName)) $ envDbName envOpts