Merge pull request #887 from AmpersandTarski/update-proto-framework

Update prototype framework version to latest release v1.1.0
AmpersandTarski · Jan 18, 2019 · 7eeade1 · 7eeade1
2 parents fc35616 + 8699be5
commit 7eeade1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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