Merge pull request #128 from danicheg/cleanup

Fix some deprecations
scalacenter · Jul 7, 2024 · 9e79ca5 · 9e79ca5
2 parents b4b55c9 + 189f441
commit 9e79ca5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -69,7 +69,7 @@ lazy val profiledb = project
     libraryDependencies +=
       "com.thesamet.scalapb" %% "scalapb-runtime" % scalapbVersion % "protobuf",
     Compile / managedSourceDirectories += target.value / "protobuf-generated",
-    Compile / PB.targets in Compile := Seq(
+    Compile / PB.targets := Seq(
       scalapb.gen() -> (target.value / "protobuf-generated")
     ),
     buildInfoPackage := "scalac.profiling.internal.build",

diff --git a/project/BuildPlugin.scala b/project/BuildPlugin.scala
@@ -75,7 +75,7 @@ object BuildKeys {
     val targetDir = (Compile / Keys.target).value
     val compiledClassesDir = targetDir / s"scala-$scalaBinVersion/classes"
     val testClassesDir = targetDir / s"scala-$scalaBinVersion/test-classes"
-    val libraryJar = Keys.scalaInstance.value.libraryJar.getAbsolutePath
+    val libraryJar = Keys.scalaInstance.value.libraryJars.head.getAbsolutePath
     val deps = (Compile / Keys.libraryDependencies).value.mkString(":")
     val classpath = s"$compiledClassesDir:$testClassesDir:$libraryJar:$deps"
     val resourceDir = (Compile / Keys.resourceManaged).value
@@ -109,7 +109,7 @@ object BuildKeys {
   ////////////////////////////////////////////////////////////////////////////////
 
   def inProject(ref: Reference)(ss: Seq[Setting[_]]): Seq[Setting[_]] =
-    sbt.inScope(sbt.ThisScope.in(project = ref))(ss)
+    sbt.inScope(sbt.ThisScope.copy(project = Select(ref)))(ss)
 
   def inProjectRefs(refs: Seq[Reference])(ss: Setting[_]*): Seq[Setting[_]] =
     refs.flatMap(inProject(_)(ss))