From 07d7d9acca78f95d49ea159261ae15b563233077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Sat, 16 Mar 2019 11:10:24 +0800 Subject: [PATCH 1/7] Update plugins.sbt --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e730667c3..64e313798 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") -addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0") +addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From 9ac96472a1001043e81b0c317bddc98295c50cf0 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Sat, 16 Mar 2019 12:23:16 +0800 Subject: [PATCH 2/7] Upgrade sonatype and sbt-best-practice --- project/plugins.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 64e313798..4d274e315 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,6 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "6.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.0") + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") From 64f8b344ef8865750dcdfa6d3d9fe9b300aadb02 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 21 Mar 2019 22:20:28 +0800 Subject: [PATCH 3/7] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4d274e315..1e36fc0d1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") From 1e73dfa1dc5d64460439cad0839e567ed0e9164b Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 27 Mar 2019 03:01:14 +0800 Subject: [PATCH 4/7] Setup Scalafmt version --- .scalafmt.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/.scalafmt.conf b/.scalafmt.conf index e661d6c10..f216dbfd5 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1 +1,2 @@ +version = "1.5.1" maxColumn = 120 \ No newline at end of file From cad0cb42abba01405f7ddf00a5b0d5740fcf3bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 27 Mar 2019 16:28:03 +0800 Subject: [PATCH 5/7] Upgrade sbt-dynver --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1e36fc0d1..5b518560b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.0.1 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0+14-76cb6848") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") From 13a9465e183bec715b01235d596f316540f25ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=8D=9A=20=28Yang=20Bo=29?= Date: Wed, 27 Mar 2019 16:30:51 +0800 Subject: [PATCH 6/7] Create dynver-dash-separator.sbt Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14 --- dynver-dash-separator.sbt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dynver-dash-separator.sbt diff --git a/dynver-dash-separator.sbt b/dynver-dash-separator.sbt new file mode 100644 index 000000000..7fd7b2d6b --- /dev/null +++ b/dynver-dash-separator.sbt @@ -0,0 +1,2 @@ +// Temporary workaround for https://github.com/maxcellent/javadoc.io/issues/14 +ThisBuild / dynverSeparator := "-" From 8f4803047b14f9c77436ceda3c613e624bab3096 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 27 Mar 2019 16:43:39 +0800 Subject: [PATCH 7/7] Use coursier by default --- project/coursier.sbt | 1 + project/project/plugins.sbt | 1 + 2 files changed, 2 insertions(+) create mode 100644 project/coursier.sbt create mode 100644 project/project/plugins.sbt diff --git a/project/coursier.sbt b/project/coursier.sbt new file mode 100644 index 000000000..3a2d48ea4 --- /dev/null +++ b/project/coursier.sbt @@ -0,0 +1 @@ +addSbtCoursier diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt new file mode 100644 index 000000000..08e93dc88 --- /dev/null +++ b/project/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M11")