From a42e72f098b1685aa69e4d934ac84d38b648a766 Mon Sep 17 00:00:00 2001 From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com> Date: Fri, 3 Feb 2023 19:16:49 +0900 Subject: [PATCH 1/6] chore(deps): bump protoc library --- project/scalapb.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/scalapb.sbt b/project/scalapb.sbt index a0a6ca4c91..8363432e9d 100644 --- a/project/scalapb.sbt +++ b/project/scalapb.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.28") +addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") -libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.1" +libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.11" From 17d68f1ad5da4ae5b7efd28bd3e230d809a2a7e8 Mon Sep 17 00:00:00 2001 From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com> Date: Sun, 26 Feb 2023 20:41:33 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix(ci):=20assemblyMergeStrategy=E3=82=92?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.sbt b/build.sbt index b6108f6653..c82f20a7ba 100644 --- a/build.sbt +++ b/build.sbt @@ -127,6 +127,15 @@ assembly / assemblyExcludedJars := { } } +// protocol配下とルートのLICENSEが衝突してCIが落ちる +// cf. https://github.com/sbt/sbt-assembly/issues/141 +assembly / assemblyMergeStrategy := { + case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.rename + case otherFile => + val oldStrategy = (assembly / assemblyMergeStrategy).value + oldStrategy(otherFile) +} + // endregion // region プラグインJarに埋め込むリソースの処理 From ff7e404f344e7e4c1d0440663ded658a90556dc5 Mon Sep 17 00:00:00 2001 From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com> Date: Sun, 26 Feb 2023 20:54:57 +0900 Subject: [PATCH 3/6] rollback to legacy syntax --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c82f20a7ba..2d57457d0f 100644 --- a/build.sbt +++ b/build.sbt @@ -129,10 +129,10 @@ assembly / assemblyExcludedJars := { // protocol配下とルートのLICENSEが衝突してCIが落ちる // cf. https://github.com/sbt/sbt-assembly/issues/141 -assembly / assemblyMergeStrategy := { +assemblyMergeStrategy in assembly := { case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.rename case otherFile => - val oldStrategy = (assembly / assemblyMergeStrategy).value + val oldStrategy = (assemblyMergeStrategy in assembly).value oldStrategy(otherFile) } From 3be6e51c42ac917bf873bd4f9fde84af0bc8cacb Mon Sep 17 00:00:00 2001 From: Kory | Ryosuke Kondo <6561358+kory33@users.noreply.github.com> Date: Sun, 26 Feb 2023 22:47:34 +0000 Subject: [PATCH 4/6] fix: apply suggestion --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 2d57457d0f..1da3be3b6f 100644 --- a/build.sbt +++ b/build.sbt @@ -129,10 +129,10 @@ assembly / assemblyExcludedJars := { // protocol配下とルートのLICENSEが衝突してCIが落ちる // cf. https://github.com/sbt/sbt-assembly/issues/141 -assemblyMergeStrategy in assembly := { +assemblyMergeStrategy in ThisBuild := { case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.rename case otherFile => - val oldStrategy = (assemblyMergeStrategy in assembly).value + val oldStrategy = (assemblyMergeStrategy in ThisBuild).value oldStrategy(otherFile) } From 89ef5358b8bc9a01bd733e43d74aef14bf007ae0 Mon Sep 17 00:00:00 2001 From: Kory | Ryosuke Kondo <6561358+kory33@users.noreply.github.com> Date: Sun, 26 Feb 2023 22:54:29 +0000 Subject: [PATCH 5/6] revert previous suggestion --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 1da3be3b6f..2d57457d0f 100644 --- a/build.sbt +++ b/build.sbt @@ -129,10 +129,10 @@ assembly / assemblyExcludedJars := { // protocol配下とルートのLICENSEが衝突してCIが落ちる // cf. https://github.com/sbt/sbt-assembly/issues/141 -assemblyMergeStrategy in ThisBuild := { +assemblyMergeStrategy in assembly := { case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.rename case otherFile => - val oldStrategy = (assemblyMergeStrategy in ThisBuild).value + val oldStrategy = (assemblyMergeStrategy in assembly).value oldStrategy(otherFile) } From f580b0a00fd5ab6f46d9aef280b469e88bf68b5c Mon Sep 17 00:00:00 2001 From: rito528 Date: Sun, 12 Mar 2023 14:21:02 +0900 Subject: [PATCH 6/6] =?UTF-8?q?build:=20unmanagedResource=E3=81=ABLICENCE?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 2d57457d0f..bfdf6be2f1 100644 --- a/build.sbt +++ b/build.sbt @@ -129,10 +129,10 @@ assembly / assemblyExcludedJars := { // protocol配下とルートのLICENSEが衝突してCIが落ちる // cf. https://github.com/sbt/sbt-assembly/issues/141 -assemblyMergeStrategy in assembly := { - case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.rename +assembly / assemblyMergeStrategy := { + case PathList(ps @ _*) if ps.last endsWith "LICENSE" => MergeStrategy.first case otherFile => - val oldStrategy = (assemblyMergeStrategy in assembly).value + val oldStrategy = (assembly / assemblyMergeStrategy).value oldStrategy(otherFile) } @@ -159,8 +159,6 @@ Compile / filteredResourceGenerator := Compile / resourceGenerators += (Compile / filteredResourceGenerator) -Compile / unmanagedResources += baseDirectory.value / "LICENSE" - // トークン置換を行ったファイルをunmanagedResourcesのコピーから除外する unmanagedResources / excludeFilter := filesToBeReplacedInResourceFolder.foldLeft((unmanagedResources / excludeFilter).value)(