diff options
author | Christian Duerr <contact@christianduerr.com> | 2019-11-19 21:34:34 +0100 |
---|---|---|
committer | Christian Duerr <contact@christianduerr.com> | 2019-11-19 21:34:34 +0100 |
commit | ec3fa2b33a84d196457c1bc424e22f28a8648c15 (patch) | |
tree | 770fd1a8f28eaa0fd34487f86be8142648ce8635 | |
parent | 4b2be6d7b1a6161f1b1fcd40576c3417779cfb90 (diff) | |
download | alacritty-ec3fa2b33a84d196457c1bc424e22f28a8648c15.tar.gz alacritty-ec3fa2b33a84d196457c1bc424e22f28a8648c15.zip |
Bump master to 0.4.1-dev
To make the release process a bit smoother and prevent a freeze of the
master process while review candidates are out, this will put the master
in a perpetual development state.
This should make it clear to everyone that the official source for
releases is always the tagged branch and make it possible to release new
versions completely independently.
Since versions are bumped after each release, this makes it so the
release branches do not have to get merged back into the master branch
to show the correct development version.
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | Cargo.lock | 6 | ||||
-rw-r--r-- | alacritty/Cargo.toml | 2 | ||||
-rw-r--r-- | alacritty_terminal/Cargo.toml | 2 | ||||
-rw-r--r-- | extra/alacritty.man | 2 | ||||
-rw-r--r-- | extra/linux/io.alacritty.Alacritty.appdata.xml | 2 | ||||
-rw-r--r-- | extra/linux/redhat/alacritty.spec | 2 | ||||
-rw-r--r-- | extra/linux/snap/snapcraft.yaml | 2 | ||||
-rw-r--r-- | extra/osx/Alacritty.app/Contents/Info.plist | 2 | ||||
-rw-r--r-- | extra/windows/wix/alacritty.wxs | 2 |
11 files changed, 14 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 4232282b..458edc98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,4 +63,3 @@ deploy: rust: stable condition: $CLIPPY != true repo: jwilm/alacritty - branch: master diff --git a/CHANGELOG.md b/CHANGELOG.md index 45966460..ad47249f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## 0.4.1-dev + +## 0.4.0-dev ### Packaging @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "alacritty" -version = "0.3.3" +version = "0.4.1-dev" dependencies = [ - "alacritty_terminal 0.3.3", + "alacritty_terminal 0.4.1-dev", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "alacritty_terminal" -version = "0.3.3" +version = "0.4.1-dev" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index b47ff293..c28f0564 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty" -version = "0.3.3" +version = "0.4.1-dev" authors = ["Joe Wilm <joe@jwilm.com>"] license = "Apache-2.0" description = "GPU-accelerated terminal emulator" diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml index d42295b7..36efde99 100644 --- a/alacritty_terminal/Cargo.toml +++ b/alacritty_terminal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty_terminal" -version = "0.3.3" +version = "0.4.1-dev" authors = ["Joe Wilm <joe@jwilm.com>"] license = "Apache-2.0" build = "build.rs" diff --git a/extra/alacritty.man b/extra/alacritty.man index 5f3bf3cb..76a8a94a 100644 --- a/extra/alacritty.man +++ b/extra/alacritty.man @@ -1,4 +1,4 @@ -.TH ALACRITTY "1" "August 2018" "alacritty 0.3.3" "User Commands" +.TH ALACRITTY "1" "August 2018" "alacritty 0.4.1-dev" "User Commands" .SH NAME alacritty \- a cross-platform, gpu-accelerated terminal emulator .SH "SYNOPSIS" diff --git a/extra/linux/io.alacritty.Alacritty.appdata.xml b/extra/linux/io.alacritty.Alacritty.appdata.xml index a23d6bc6..5c17d988 100644 --- a/extra/linux/io.alacritty.Alacritty.appdata.xml +++ b/extra/linux/io.alacritty.Alacritty.appdata.xml @@ -28,7 +28,7 @@ However, it does allow configuration of many aspects of the terminal.</p> <url type="homepage">https://github.com/jwilm/alacritty</url> <url type="bugtracker">https://github.com/jwilm/alacritty/issues</url> <releases> - <release version="0.3.3" date="2019-06-16" unix_timestamp="1560694196"/> + <release version="0.4.1-dev" date="2019-06-16" unix_timestamp="1560694196"/> </releases> <update_contact>https://github.com/jwilm/alacritty/blob/master/CONTRIBUTING.md#contact</update_contact> <developer_name>Joe Wilm</developer_name> diff --git a/extra/linux/redhat/alacritty.spec b/extra/linux/redhat/alacritty.spec index 477644aa..7926c0e5 100644 --- a/extra/linux/redhat/alacritty.spec +++ b/extra/linux/redhat/alacritty.spec @@ -1,5 +1,5 @@ Name: alacritty -Version: 0.3.3 +Version: 0.4.1-dev Release: 1%{?dist} Summary: A cross-platform, GPU enhanced terminal emulator License: ASL 2.0 diff --git a/extra/linux/snap/snapcraft.yaml b/extra/linux/snap/snapcraft.yaml index 7498184b..cf2485c8 100644 --- a/extra/linux/snap/snapcraft.yaml +++ b/extra/linux/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: alacritty -version: '0.3.3' +version: '0.4.1-dev' summary: Modern, GPU accelerated terminal emulator description: | Alacritty is a terminal emulator with a strong focus on simplicity and diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist index de74f787..2cb34f8d 100644 --- a/extra/osx/Alacritty.app/Contents/Info.plist +++ b/extra/osx/Alacritty.app/Contents/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.3.3</string> + <string>0.4.1-dev</string> <key>CFBundleSupportedPlatforms</key> <array> <string>MacOSX</string> diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs index 24ed1294..e6e799da 100644 --- a/extra/windows/wix/alacritty.wxs +++ b/extra/windows/wix/alacritty.wxs @@ -2,7 +2,7 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> - <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.3.3" Manufacturer="Alacritty"> + <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.4.1-dev" Manufacturer="Alacritty"> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/> <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/> <Icon Id="AlacrittyIco" SourceFile="..\extra\windows\alacritty.ico"/> |