diff --git a/.bintray-deb.json b/.bintray-deb.json index 58fe827..690bff0 100644 --- a/.bintray-deb.json +++ b/.bintray-deb.json @@ -15,9 +15,9 @@ "public_stats": false }, "version": { - "name": "version-1.0.4", - "desc": "Version 1.0.4", - "vcs_tag": "version-1.0.4", + "name": "version-1.0.5", + "desc": "Version 1.0.5", + "vcs_tag": "version-1.0.5", "gpgSign": true }, "files": diff --git a/.bintray-rpm.json b/.bintray-rpm.json index 720c481..367b608 100644 --- a/.bintray-rpm.json +++ b/.bintray-rpm.json @@ -15,9 +15,9 @@ "public_stats": false }, "version": { - "name": "version-1.0.4", - "desc": "Version 1.0.4", - "vcs_tag": "version-1.0.4", + "name": "version-1.0.5", + "desc": "Version 1.0.5", + "vcs_tag": "version-1.0.5", "gpgSign": true }, "files": diff --git a/.version b/.version index f456e8d..4022db2 100644 --- a/.version +++ b/.version @@ -1,2 +1,2 @@ -1.0.4 -1.0.4 \ No newline at end of file +1.0.5 +1.0.5 \ No newline at end of file diff --git a/README.md b/README.md index f48fed1..fa80f82 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,14 @@ Cobra is a modern code and proof presentation framework, leveraging cutting-edge Cobra currently supports [**Isabelle**](https://isabelle.in.tum.de/index.html) proofs as well as [**Scala**](http://www.scala-lang.org/) and [**Haskell**](http://haskell.org) code -## Download **Cobra** 1.0.4 +## Download **Cobra** 1.0.5 There is a pre built binary relase for Cobra. > **Note, that Java 8 or higher is required for cobra to run.** > **It will fail to start, when used with Java 7 or below!** -All platforms: [zip](https://github.com/flatmap/cobra/releases/download/version-1.0.4/cobra-1.0.4.zip) +All platforms: [zip](https://github.com/flatmap/cobra/releases/download/version-1.0.5/cobra-1.0.5.zip) ### macOS @@ -24,9 +24,7 @@ brew tap flatmap/cobra brew install cobra ``` -### Linux - -#### Fedora / RHEL +### Fedora / RHEL There is a YUM repository available which provides automatic updates @@ -36,9 +34,9 @@ sudo mv bintray-flatmap-rpm.repo /etc/yum.repos.d/ sudo dnf install cobra ``` -#### Ubuntu / Debian +### Ubuntu / Debian -There is a PPA available for Debian / Ubuntu. Releases are signed with bintray's public key. To add it please ececute +There is a PPA available for Debian / Ubuntu. Releases are signed with bintray's private key. To add the public key please ececute ```sh apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 379CE192D401AB61 @@ -64,7 +62,7 @@ sudo apt-get install cobra-presentations ### Presentation Format -The content of a presentation is stored in a file called `slides.html`. Cobra will support a MarkDown slideformat in Version 1.1. +The content of a presentation is stored in a file called `slides.html`. Cobra will support a MarkDown slide format in Version 1.2. To add a slide, simply add `
` tags to the `slides.html` file. For the general slide format please refer to the **reveal.js** [documentation](https://github.com/hakimel/reveal.js). diff --git a/build.sbt b/build.sbt index 21d25e7..a0d2de1 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ cancelable in Global := true val commonSettings = Seq( scalaVersion := "2.11.8", - version := "1.0.4", + version := "1.0.5", maintainer := "Martin Ring", organization := "net.flatmap", scalacOptions ++= Seq("-deprecation","-feature") diff --git a/modules/cobra-server/src/main/scala/net/flatmap/cobra/Cobra.scala b/modules/cobra-server/src/main/scala/net/flatmap/cobra/Cobra.scala index 641ff18..8fcf54c 100644 --- a/modules/cobra-server/src/main/scala/net/flatmap/cobra/Cobra.scala +++ b/modules/cobra-server/src/main/scala/net/flatmap/cobra/Cobra.scala @@ -8,7 +8,7 @@ import better.files._ * Created by martin on 03.02.16. */ object Cobra extends App { - val version = "1.0.4" + val version = "1.0.5" private def assume(cond: Boolean, msg: String) = if (!cond) { println("failed to initialize: " + msg)