Merge pull request #1851 from GiganticMinecraft/KisaragiEffective-pat…

…ch-1

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.first
+  case otherFile =>
+    val oldStrategy = (assembly / assemblyMergeStrategy).value
+    oldStrategy(otherFile)
+}
+
 // endregion
 
 // region プラグインJarに埋め込むリソースの処理
@@ -150,8 +159,6 @@ Compile / filteredResourceGenerator :=
 
 Compile / resourceGenerators += (Compile / filteredResourceGenerator)
 
-Compile / unmanagedResources += baseDirectory.value / "LICENSE"
-
 // トークン置換を行ったファイルをunmanagedResourcesのコピーから除外する
 unmanagedResources / excludeFilter :=
   filesToBeReplacedInResourceFolder.foldLeft((unmanagedResources / excludeFilter).value)(

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"