Merge pull request #10 from fabianhjr/upgrade-dependencies

Upgrade mill to 0.7.x
vic · Jun 5, 2020 · 3a1255f · 3a1255f
2 parents 2646438 + 7cf3466
commit 3a1255f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
 scala 2.12.11
-mill 0.6.2
+mill 0.7.3
 java adopt-openjdk-11+28
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,10 @@
 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).
 
-## 0.2.1 - [Unreleased]
+## 0.4.0 - [Unreleased]
+
+### Changed
+- Upgrade to Mill 0.7.x and Scala 2.12.11
 
 ## [0.2.0] - 2019-09-05
 
@@ -37,7 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   Scala and mill versions are managed from `.tool-versions` file.
   The VERSION specifies this project's version number.
 
-[Unreleased]: https://github.com/vic/mill-docker/compare/0.2.0...HEAD
+[Unreleased]: https://github.com/vic/mill-docker/compare/0.4.0...HEAD
 [0.2.0]: https://github.com/vic/mill-docker/compare/0.1.0...0.2.0
 [0.1.0]: https://github.com/vic/mill-docker/compare/0.0.7...0.1.0
 [0.0.7]: https://github.com/vic/mill-docker/compare/0.0.6...0.0.7

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.0
+0.4.0
diff --git a/build.sc b/build.sc
@@ -43,5 +43,4 @@ object docker extends ScalaModule with PublishModule {
   def compileIvyDeps = Agg(
     ivy"com.lihaoyi::mill-scalalib:${millVersion}",
   )
-
 }
diff --git a/example/build.sc b/example/build.sc
@@ -12,12 +12,12 @@ interp.repositories() =
 import mill._, scalalib._
 
 // import mill-docker
-import $ivy.`io.github.vic::mill-docker:0.3.0`, mill.docker._
+import $ivy.`io.github.vic::mill-docker:0.4.0`, mill.docker._
 
 
 object hello extends ScalaModule with DockerModule {
 
-  def scalaVersion = "2.12.8"
+  def scalaVersion = "2.12.11"
   def dockerTag = "hello:latest"
 
   // optionally provide default arguments to your program
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,5 +43,4 @@ object docker extends ScalaModule with PublishModule { @@
       def compileIvyDeps = Agg(
         ivy"com.lihaoyi::mill-scalalib:${millVersion}",
       )
     }