fix bundle for scala 3

kamon-io · Dec 3, 2023 · 5b12f6b · 5b12f6b
1 parent 6bb9870
commit 5b12f6b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 43 deletions.
diff --git a/build.sbt b/build.sbt
@@ -36,7 +36,6 @@ lazy val `kamon-core` = (project in file("core/kamon-core"))
   .settings(
     buildInfoKeys := Seq[BuildInfoKey](version),
     buildInfoPackage := "kamon.status",
-    crossScalaVersions += `scala_3_version`,
     scalacOptions ++= { if(scalaBinaryVersion.value == "2.11") Seq("-Ydelambdafy:method") else Seq.empty },
     assembly / assemblyShadeRules := Seq(
       ShadeRule.rename("org.jctools.**"                             -> "kamon.lib.@0").inAll,
@@ -71,7 +70,6 @@ lazy val `kamon-core` = (project in file("core/kamon-core"))
 lazy val `kamon-status-page` = (project in file("core/kamon-status-page"))
   .enablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     assembly / assemblyShadeRules := Seq(
       ShadeRule.rename("com.grack.nanojson.**"  -> "kamon.lib.@0").inAll,
       ShadeRule.rename("fi.iki.elonen.**"       -> "kamon.lib.@0").inAll,
@@ -86,7 +84,6 @@ lazy val `kamon-status-page` = (project in file("core/kamon-status-page"))
 lazy val `kamon-testkit` = (project in file("core/kamon-testkit"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies += scalatest % "provided,test"
   ).dependsOn(`kamon-core`)
 
@@ -95,7 +92,6 @@ lazy val `kamon-core-tests` = (project in file("core/kamon-core-tests"))
   .disablePlugins(AssemblyPlugin)
   .settings(noPublishing: _*)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       scalatest % "test",
       logbackClassic % "test"
@@ -106,7 +102,6 @@ lazy val `kamon-core-tests` = (project in file("core/kamon-core-tests"))
 lazy val `kamon-core-bench` = (project in file("core/kamon-core-bench"))
   .disablePlugins(AssemblyPlugin)
   .enablePlugins(JmhPlugin)
-  .settings(crossScalaVersions += `scala_3_version`)
   .settings(noPublishing: _*)
   .dependsOn(`kamon-core`)
 
@@ -162,9 +157,6 @@ lazy val `kamon-instrumentation-common` = (project in file("instrumentation/kamo
   .disablePlugins(AssemblyPlugin)
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
-  .settings(
-        crossScalaVersions += `scala_3_version`,
-  )
   .settings(
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
@@ -178,7 +170,6 @@ lazy val `kamon-instrumentation-common` = (project in file("instrumentation/kamo
 lazy val `kamon-executors` = (project in file("instrumentation/kamon-executors"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       scalatest % "test",
@@ -204,6 +195,7 @@ lazy val `kamon-twitter-future` = (project in file("instrumentation/kamon-twitte
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`),
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "com.twitter" %% "util-core" % "20.3.0" % "provided",
@@ -218,6 +210,7 @@ lazy val `kamon-scalaz-future` = (project in file("instrumentation/kamon-scalaz-
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`),
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "org.scalaz" %% "scalaz-concurrent" % "7.2.28" % "provided",
@@ -231,7 +224,6 @@ lazy val `kamon-scala-future` = (project in file("instrumentation/kamon-scala-fu
   .disablePlugins(AssemblyPlugin)
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
-  .settings(crossScalaVersions += `scala_3_version`)
   .settings(
     libraryDependencies ++=Seq(
       kanelaAgent % "provided",
@@ -246,6 +238,7 @@ lazy val `kamon-cats-io` = (project in file("instrumentation/kamon-cats-io"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`),
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       {
@@ -281,7 +274,6 @@ lazy val `kamon-logback` = (project in file("instrumentation/kamon-logback"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += scala_3_version,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       logbackClassic % "provided",
@@ -299,7 +291,6 @@ lazy val `kamon-jdbc` = (project in file("instrumentation/kamon-jdbc"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += scala_3_version, //
     libraryDependencies ++= Seq(
       jsqlparser,
       kanelaAgent % "provided",
@@ -322,7 +313,6 @@ lazy val `kamon-kafka` = (project in file("instrumentation/kamon-kafka"))
   .disablePlugins(AssemblyPlugin)
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
-  .settings(crossScalaVersions += `scala_3_version`)
   .settings(
     libraryDependencies ++= Seq(
       kanelaAgent                 % "provided",
@@ -340,6 +330,7 @@ lazy val `kamon-mongo-legacy` = (project in file("instrumentation/kamon-mongo-le
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`),
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "org.mongodb"         %   "mongodb-driver-sync"             % "3.11.0" % "provided",
@@ -358,6 +349,7 @@ lazy val `kamon-mongo` = (project in file("instrumentation/kamon-mongo"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`),
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "org.mongodb"         %   "mongodb-driver-sync"             % "4.2.3" % "provided",
@@ -374,15 +366,13 @@ lazy val `kamon-cassandra` = (project in file("instrumentation/kamon-cassandra")
   .disablePlugins(AssemblyPlugin)
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
-  .settings(crossScalaVersions += scala_3_version)
   .dependsOn(`kamon-core`, `kamon-instrumentation-common`, `kamon-testkit` % "test", `kamon-executors`)
 
 lazy val `kamon-elasticsearch` = (project in file("instrumentation/kamon-elasticsearch"))
   .disablePlugins(AssemblyPlugin)
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += scala_3_version,
     Test / run / fork := true,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
@@ -400,7 +390,6 @@ lazy val `kamon-spring` = (project in file("instrumentation/kamon-spring"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += scala_3_version,
     Test / run / fork := true,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
@@ -431,7 +420,6 @@ lazy val `kamon-annotation` = (project in file("instrumentation/kamon-annotation
   .enablePlugins(AssemblyPlugin)
   .settings(instrumentationSettings: _*)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     assembly / assemblyShadeRules := Seq(
       ShadeRule.rename("javax.el.**"    -> "kamon.lib.@0").inAll,
       ShadeRule.rename("com.sun.el.**"  -> "kamon.lib.@0").inAll,
@@ -452,7 +440,6 @@ lazy val `kamon-annotation` = (project in file("instrumentation/kamon-annotation
 lazy val `kamon-system-metrics` = (project in file("instrumentation/kamon-system-metrics"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       oshiCore,
       scalatest % "test",
@@ -465,7 +452,6 @@ lazy val `kamon-akka` = (project in file("instrumentation/kamon-akka"))
   .enablePlugins(JavaAgent)
   .disablePlugins(AssemblyPlugin)
   .settings(instrumentationSettings: _*)
-  .settings(crossScalaVersions += `scala_3_version`)
   .dependsOn(
     `kamon-scala-future` % "compile,common,akka-2.5,akka-2.6",
     `kamon-testkit` % "test,test-common,test-akka-2.5,test-akka-2.6"
@@ -515,7 +501,6 @@ lazy val `kamon-akka-http` = (project in file("instrumentation/kamon-akka-http")
       "de.heikoseeberger" %% "akka-http-json4s"     % "1.27.0" % "test" cross CrossVersion.for3Use2_13 intransitive(),
       "org.json4s"        %% "json4s-native"        % "4.0.6" % "test",
     )))
-  .settings(crossScalaVersions += `scala_3_version`)
   .dependsOn(`kamon-akka`, `kamon-testkit` % "test")
 
 
@@ -612,7 +597,8 @@ lazy val `kamon-akka-grpc` = (project in file("instrumentation/kamon-akka-grpc")
 lazy val `kamon-play` = (project in file("instrumentation/kamon-play"))
   .enablePlugins(JavaAgent)
   .disablePlugins(AssemblyPlugin)
-  .settings(instrumentationSettings)
+  .settings(instrumentationSettings,
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`))
   .dependsOn(
     `kamon-akka` % "compile,test-common,test-play-2.8,test-play-2.7,test-play-2.6",
     `kamon-akka-http` % "compile,test-common,test-play-2.8,test-play-2.7,test-play-2.6",
@@ -625,7 +611,6 @@ lazy val `kamon-okhttp` = (project in file("instrumentation/kamon-okhttp"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += scala_3_version,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "com.squareup.okhttp3"      % "okhttp"                    % "4.10.0" % "provided",
@@ -667,7 +652,6 @@ lazy val `kamon-redis` = (project in file("instrumentation/kamon-redis"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "redis.clients" % "jedis"  % "3.6.0" % "provided",
@@ -685,7 +669,6 @@ lazy val `kamon-caffeine` = (project in file("instrumentation/kamon-caffeine"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "com.github.ben-manes.caffeine" % "caffeine" % "2.8.5" % "provided",
@@ -699,6 +682,7 @@ lazy val `kamon-caffeine` = (project in file("instrumentation/kamon-caffeine"))
 lazy val `kamon-lagom` = (project in file("instrumentation/kamon-lagom"))
   .disablePlugins(AssemblyPlugin)
   .settings(
+    crossScalaVersions := Seq(`scala_2.11_version`, `scala_2.12_version`, `scala_2.13_version`),
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, scalaMajor)) if scalaMajor == 11 => providedScope("com.lightbend.lagom" %% "lagom-server" % "1.4.13")
@@ -728,7 +712,6 @@ lazy val `kamon-aws-sdk` = (project in file("instrumentation/kamon-aws-sdk"))
   .enablePlugins(JavaAgent)
   .settings(instrumentationSettings)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       kanelaAgent % "provided",
       "com.amazonaws" % "aws-java-sdk-lambda" % "1.12.225" % "provided",
@@ -783,7 +766,6 @@ lazy val reporters = (project in file("reporters"))
 lazy val `kamon-datadog` = (project in file("reporters/kamon-datadog"))
   .enablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     assembly / assemblyMergeStrategy := {
       case PathList("META-INF", xs @ _*)  => MergeStrategy.discard
       case _                              => MergeStrategy.first
@@ -808,7 +790,6 @@ lazy val `kamon-datadog` = (project in file("reporters/kamon-datadog"))
 lazy val `kamon-apm-reporter` = (project in file("reporters/kamon-apm-reporter"))
   .enablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     assembly / test := {},
     assembly / assemblyMergeStrategy := {
       case PathList("META-INF", xs @ _*)  => MergeStrategy.discard
@@ -841,15 +822,13 @@ lazy val `kamon-apm-reporter` = (project in file("reporters/kamon-apm-reporter")
 lazy val `kamon-statsd` = (project in file("reporters/kamon-statsd"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies += scalatest % Test,
   ).dependsOn(`kamon-core`)
 
 
 lazy val `kamon-zipkin` = (project in file("reporters/kamon-zipkin"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       "io.zipkin.reporter2" % "zipkin-reporter" % "2.7.15",
       "io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "2.7.15",
@@ -861,7 +840,6 @@ lazy val `kamon-zipkin` = (project in file("reporters/kamon-zipkin"))
 lazy val `kamon-jaeger` = (project in file("reporters/kamon-jaeger"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       "io.jaegertracing" % "jaeger-thrift" % "1.8.1",
       scalatest % "test"
@@ -872,7 +850,6 @@ lazy val `kamon-jaeger` = (project in file("reporters/kamon-jaeger"))
 lazy val `kamon-influxdb` = (project in file("reporters/kamon-influxdb"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       okHttp,
       okHttpMockServer % "test",
@@ -884,7 +861,6 @@ lazy val `kamon-influxdb` = (project in file("reporters/kamon-influxdb"))
 lazy val `kamon-graphite` = (project in file("reporters/kamon-graphite"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       scalatest % "test",
       logbackClassic % "test"
@@ -895,7 +871,6 @@ lazy val `kamon-graphite` = (project in file("reporters/kamon-graphite"))
 lazy val `kamon-newrelic` = (project in file("reporters/kamon-newrelic"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       "com.newrelic.telemetry" % "telemetry-core" % "0.15.0",
       "com.newrelic.telemetry" % "telemetry-http-okhttp" % "0.15.0",
@@ -907,7 +882,6 @@ lazy val `kamon-newrelic` = (project in file("reporters/kamon-newrelic"))
 lazy val `kamon-opentelemetry` = (project in file("reporters/kamon-opentelemetry"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       "io.opentelemetry" % "opentelemetry-exporter-otlp-http-trace" % "1.13.0",
       "io.opentelemetry" % "opentelemetry-exporter-otlp-trace" % "1.13.0",
@@ -922,7 +896,6 @@ lazy val `kamon-opentelemetry` = (project in file("reporters/kamon-opentelemetry
 lazy val `kamon-prometheus` = (project in file("reporters/kamon-prometheus"))
   .disablePlugins(AssemblyPlugin)
   .settings(
-    crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
       okHttp,
       scalatest % "test",
@@ -1071,9 +1044,6 @@ lazy val `kamon-bundle-dependencies-3` = (project in file("bundle/kamon-bundle-d
   .disablePlugins(AssemblyPlugin)
   .settings(noPublishing: _*)
   .settings(ideSkipProject: _*)
-  .settings(
-    crossScalaVersions := Seq(scala_3_version)
-  )
   .dependsOn(
     `kamon-runtime-attacher`,
     `kamon-status-page`,
@@ -1099,8 +1069,7 @@ lazy val `kamon-bundle-dependencies-3` = (project in file("bundle/kamon-bundle-d
     `kamon-cats-io-3`,
     `kamon-pekko`,
     `kamon-pekko-http`,
-    `kamon-pekko-grpc`,
-    `kamon-tapir`
+    `kamon-pekko-grpc`
   )
 
 lazy val `kamon-bundle` = (project in file("bundle/kamon-bundle"))

diff --git a/...elasticsearch/src/test/scala/kamon/instrumentation/ElasticSearchInstrumentationTest.scala b/...elasticsearch/src/test/scala/kamon/instrumentation/ElasticSearchInstrumentationTest.scala
@@ -85,7 +85,7 @@ class ElasticSearchInstrumentationTest
   }
 
 
-  override val container = ElasticsearchContainer()
+  override val container: ElasticsearchContainer = ElasticsearchContainer()
   var client: RestClient = _
   var highLevelClient: RestHighLevelClient = _
 
@@ -95,7 +95,7 @@ class ElasticSearchInstrumentationTest
 
     client = RestClient
       .builder(HttpHost.create(container.httpHostAddress))
-      .build
+      .build()
 
     highLevelClient = new RestHighLevelClient(
       RestClient.builder(HttpHost.create(container.httpHostAddress)))

diff --git a/project/Build.scala b/project/Build.scala
@@ -138,7 +138,8 @@ object BaseProject extends AutoPlugin {
     crossScalaVersions := Seq(
       autoImport.`scala_2.11_version`,
       autoImport.`scala_2.12_version`,
-      autoImport.`scala_2.13_version`
+      autoImport.`scala_2.13_version`,
+      autoImport.`scala_3_version`
     ),
     javacOptions := Seq(
       "-source", "1.8",