chore: upgrade to latest zio libraries; prep 1.2.0 release

idc101 · Oct 21, 2020 · 1b94f02 · 1b94f02
1 parent b3d37ff
commit 1b94f02
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 import Dependencies._
 
 ThisBuild / scalaVersion := "2.12.11"
-ThisBuild / version := "1.1.1"
+ThisBuild / version := "1.2.0"
 ThisBuild / organization := "net.cardnell"
 
 lazy val root = (project in file("."))
@@ -10,12 +10,12 @@ lazy val root = (project in file("."))
         scalacOptions += "-Ypartial-unification",
         libraryDependencies += "org.typelevel" %% "cats-core" % "2.0.0",
         libraryDependencies += "com.monovore" %% "decline" % "1.0.0",
-        libraryDependencies += "dev.zio" %% "zio" % "1.0.0-RC20",
-        libraryDependencies += "dev.zio" %% "zio-process" % "0.0.5",
-        libraryDependencies += "dev.zio" %% "zio-config" % "1.0.0-RC20",
-        libraryDependencies += "dev.zio" %% "zio-config-typesafe" % "1.0.0-RC20",
-        libraryDependencies += "dev.zio" %% "zio-test"     % "1.0.0-RC20" % Test,
-        libraryDependencies += "dev.zio" %% "zio-test-sbt" % "1.0.0-RC20" % Test,
+        libraryDependencies += "dev.zio" %% "zio" % "1.0.3",
+        libraryDependencies += "dev.zio" %% "zio-process" % "0.1.0",
+        libraryDependencies += "dev.zio" %% "zio-config" % "1.0.0-RC27",
+        libraryDependencies += "dev.zio" %% "zio-config-typesafe" % "1.0.0-RC27",
+        libraryDependencies += "dev.zio" %% "zio-test"     % "1.0.3" % Test,
+        libraryDependencies += "dev.zio" %% "zio-test-sbt" % "1.0.3" % Test,
 
         testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
 

diff --git a/docs/installation.md b/docs/installation.md
@@ -3,7 +3,7 @@
 ## Linux
 
 ```bash
-curl -L https://github.com/idc101/git-mkver/releases/download/v1.1.1/git-mkver-darwin-amd64-1.1.1.tar.gz | tar xvz
+curl -L https://github.com/idc101/git-mkver/releases/download/v1.2.0/git-mkver-darwin-amd64-1.2.0.tar.gz | tar xvz
 sudo mv git-mkver /usr/local/bin
 ```
 

diff --git a/etc/Formula/git-mkver.rb b/etc/Formula/git-mkver.rb
@@ -1,6 +1,6 @@
 class GitMkver < Formula
-  MKVER_VERSION = "1.1.1".freeze
-  MKVER_SHA256  = "9f6c6d5b4f96c9f3f3da9d58aee8d9f133c706db3cfb915e48e3a3d1964cede2".freeze
+  MKVER_VERSION = "1.2.0".freeze
+  MKVER_SHA256  = "c4c0c0f6111d71d82d4595b2194d46f4c07a3db0bb639096aef7746a257a04bc".freeze
 
   desc "Installs git-mkver from pre-built binaries"
   homepage "https://idc101.github.io/git-mkver/"

diff --git a/etc/scoop/git-mkver.json b/etc/scoop/git-mkver.json
@@ -1,7 +1,7 @@
 {
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Automatic Semantic Versioning for git based software development",
-  "url": "https://github.com/idc101/git-mkver/releases/download/v1.1.1/git-mkver-windows-amd64-1.1.1.zip",
+  "url": "https://github.com/idc101/git-mkver/releases/download/v1.2.0/git-mkver-windows-amd64-1.2.0.zip",
   "hash": "D61C8CB6DC380BA1E6985377C3E2AFE6DAD5DE6993EA1352A705B0C1CCBCE85A",
   "extract_to": "",
   "bin": "git-mkver.exe"

diff --git a/etc/shell/install.sh b/etc/shell/install.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-MKVER_VERSION=1.1.1
+MKVER_VERSION=1.2.0
 curl -L https://github.com/idc101/git-mkver/releases/download/v${MKVER_VERSION}/git-mkver-darwin-amd64-${MKVER_VERSION}.tar.gz -o git-mkver.tar.gz
 tar xvzf git-mkver.tar.gz
 sudo mv git-mkver /usr/local/bin

diff --git a/src/main/scala/net/cardnell/mkver/AppConfig.scala b/src/main/scala/net/cardnell/mkver/AppConfig.scala
@@ -103,7 +103,7 @@ object ConfigDesc {
   val patchConfigDesc = (
     string("name").describe("Name of patch, referenced from branch configs") |@|
       list("filePatterns")(string).describe("Files to apply find and replace in. Supports ** and * glob patterns.") |@|
-      listStrict("replacements")(replacementDesc).describe("Find and replace patterns")
+      list("replacements")(replacementDesc).describe("Find and replace patterns")
     )(PatchConfig.apply, PatchConfig.unapply)
 
   val commitMessageActionDesc = (
@@ -124,7 +124,7 @@ object ConfigDesc {
   val whenNoValidCommitMessages = string("whenNoValidCommitMessages")
     .xmapEither(ConfigDesc.readIncrementAction, (output: IncrementAction) => Right(output.toString))
     .describe("behaviour if no valid commit messages are found Fail|IncrementMajor|IncrementMinor|IncrementPatch|NoIncrement")
-  val formatsDesc = listStrict("formats")(ConfigDesc.formatDesc).describe("custom format strings")
+  val formatsDesc = list("formats")(ConfigDesc.formatDesc).describe("custom format strings")
   val patchesDesc = list("patches")(string).describe("Patch configs to be applied")
 
   val branchConfigDefaultsDesc = (
@@ -158,9 +158,9 @@ object AppConfig {
       .default(VersionMode.SemVer) |@|
       string("tagPrefix").describe("prefix for git tags").optional |@|
       nested("defaults")(ConfigDesc.branchConfigDefaultsDesc).optional |@|
-      listStrict("branches")(ConfigDesc.branchConfigDesc).optional |@|
-      listStrict("patches")(ConfigDesc.patchConfigDesc).optional |@|
-      listStrict("commitMessageActions")(ConfigDesc.commitMessageActionDesc).optional
+      list("branches")(ConfigDesc.branchConfigDesc).optional |@|
+      list("patches")(ConfigDesc.patchConfigDesc).optional |@|
+      list("commitMessageActions")(ConfigDesc.commitMessageActionDesc).optional
     )(AppConfig.apply, AppConfig.unapply)
   val runConfigDesc = (
         tagDesc |@|
@@ -169,10 +169,10 @@ object AppConfig {
           preReleaseFormatDesc |@|
           buildMetaDataFormatDesc |@|
           includeBuildMetaDataDesc |@|
-          listStrict("commitMessageActions")(ConfigDesc.commitMessageActionDesc) |@|
+          list("commitMessageActions")(ConfigDesc.commitMessageActionDesc) |@|
           whenNoValidCommitMessages |@|
           formatsDesc |@|
-          listStrict("patches")(ConfigDesc.patchConfigDesc)
+          list("patches")(ConfigDesc.patchConfigDesc)
     )(RunConfig.apply, RunConfig.unapply)
 
   val defaultDefaultBranchConfig: BranchConfigDefaults = BranchConfigDefaults(
@@ -280,7 +280,7 @@ object AppConfig {
   def tryLoadAppConfig(file: String): Task[AppConfig] = {
     for {
       configSource <- TypesafeConfigSource.fromTypesafeConfig(ConfigFactory.parseFile(new java.io.File(file)))
-        .fold(l => Task.fail(MkVerException(l)), r => Task.succeed(r))
+        .fold(l => Task.fail(MkVerException(l.getMessage())), r => Task.succeed(r))
       appConfig <- read(AppConfig.appConfigDesc from configSource)
         .fold(l => Task.fail(MkVerException("Unable to parse config: " + l.prettyPrint())), r => Task.succeed(r))
     } yield appConfig

diff --git a/src/main/scala/net/cardnell/mkver/package.scala b/src/main/scala/net/cardnell/mkver/package.scala
@@ -5,5 +5,5 @@ import zio.Has
 package object mkver {
   type Git = Has[Git.Service]
 
-  val GitMkverVersion = "1.1.1"
+  val GitMkverVersion = "1.2.0"
 }