diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343768c9c..df7f98380 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,26 +1,23 @@
# Changelog
## [Unreleased]
-### Added
-- `eagerOption {}` function to more easily register eager options.
-- Eager options can now be added to option groups in help out by passing a value for `groupName` when creating them.
-
-### Fixed
-- `file()` and `path()` conversions will now properly expand leading `~` in paths to the home directory for `mustExist`, `canBeFile`, and `canBeDir` checks. The property value is unchanged, and can still begin with a `~`. ([#131](https://github.com/ajalt/clikt/issues/79))
+## [2.5.0] - 2020-02-22
-### Changed
-- `NoRunCliktCommand` was renamed to `NoOpCliktCommand`. The existing class is deprecated. ([#130](https://github.com/ajalt/clikt/issues/130))
-
-## [2.5.0-beta1] - 2020-02-13
### Added
- Clikt is now available as a Kotlin Multiplatform Project, supporting JVM, NodeJS, and native Windows, Linux, and macOS.
+- `eagerOption {}` function to more easily register eager options.
+- Eager options can now be added to option groups in help out by passing a value for `groupName` when creating them.
- `canBeSymlink` parameter to `file()` and `path()` conversions that can be used to disallow symlinks
- `CliktCommand.eagerOption` to simplify creating custom eager options
### Changed
+- `NoRunCliktCommand` was renamed to `NoOpCliktCommand`. The existing class is deprecated. ([#130](https://github.com/ajalt/clikt/issues/130))
- The `CliktCommand.context` property has been deprecated in favor of the new name, `currentContext`, to avoid confusion with the `CliktCommand.context{}` method.
- The parameter names of `file()` and `path()` conversions have changed. The existing names are deprecated, and can be converted to the new usages with an IntelliJ inspection. Note that if you are calling these functions with unnamed arguments (e.g. `file(true, false)`), you'll need to add argument names in order to remove the deprecation warning.
+### Fixed
+- `file()` and `path()` conversions will now properly expand leading `~` in paths to the home directory for `mustExist`, `canBeFile`, and `canBeDir` checks. The property value is unchanged, and can still begin with a `~`. ([#131](https://github.com/ajalt/clikt/issues/79))
+
## [2.4.0] - 2020-01-25
### Added
- `CompletionCandidates.Fixed` now has a secondary convenience constructor that take a `vararg` of `String`s
diff --git a/README.md b/README.md
index 42137a048..fef73c7ce 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,11 @@ Clikt has:
```kotlin
class Hello : CliktCommand() {
- val count: Int by option(help = "Number of greetings").int().default(1)
- val name: String by option(help = "The person to greet").prompt("Your name")
+ val count: Int by option(help="Number of greetings").int().default(1)
+ val name: String by option(help="The person to greet").prompt("Your name")
override fun run() {
- for (i in 1..count) {
+ repeat(count) {
echo("Hello $name!")
}
}
@@ -78,10 +78,18 @@ Clikt is distributed through [Maven Central](https://search.maven.org/artifact/c
```groovy
dependencies {
- implementation("com.github.ajalt:clikt:2.4.0")
+ implementation("com.github.ajalt:clikt:2.5.0")
}
```
+#### Multiplatform
+
+For multiplatform projects, use `"com.github.ajalt:clikt-multiplatform:$cliktVersion"` instead.
+
+Clikt supports the following targets: `jvm`, `mingwX64`, `linuxX64`, `macosX64`, and `js` (for NodeJS).
+
+#### Snapshots
+
Snapshot builds are also available
@@ -96,9 +104,6 @@ repositories {
}
}
```
-
-For Kotlin/Native and Kotlin/JS, use `"com.github.ajalt:clikt-multiplatform:$cliktVersion"` instead.
-