Update build.sbt for M1s and remove deprecation warnings (#567)

* Update build.sbt for M1s and remove deprecation warnings

* Remove -no-java-comments

* Widen bounds for parquet sampling test

Author: idreeskhan

build.sbt

@@ -50,12 +50,6 @@ val commonSettings = Sonatype.sonatypeSettings ++ releaseSettings ++ Seq(
   crossScalaVersions := Seq("2.12.10", "2.13.8"),
   resolvers += "confluent" at "https://packages.confluent.io/maven/",
   scalacOptions ++= Seq("-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Yrangepos"),
-  scalacOptions in (Compile, doc) ++= {
-    scalaBinaryVersion.value match {
-      case "2.12" => "-no-java-comments" :: Nil
-      case _      => Nil
-    }
-  },
   scalacOptions ++= {
     if (isScala213x.value) {
       Seq("-Ymacro-annotations", "-Ywarn-unused")
@@ -72,19 +66,19 @@ val commonSettings = Sonatype.sonatypeSettings ++ releaseSettings ++ Seq(
       )
     }
   },
-  sourceDirectories in Compile := (sourceDirectories in Compile).value
+  Compile / sourceDirectories := (Compile / sourceDirectories).value
     .filterNot(_.getPath.endsWith("/src_managed/main")),
-  managedSourceDirectories in Compile := (managedSourceDirectories in Compile).value
+  Compile / managedSourceDirectories := (Compile / managedSourceDirectories).value
     .filterNot(_.getPath.endsWith("/src_managed/main")),
   javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked"),
   addCompilerPlugin(scalafixSemanticdb),
   run / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
 )
 
 lazy val protoBufSettings = Seq(
-  version in ProtobufConfig := protoBufVersion,
-  protobufRunProtoc in ProtobufConfig := (args =>
-    com.github.os72.protocjar.Protoc.runProtoc("-v330" +: args.toArray)
+  ProtobufConfig / version := protoBufVersion,
+  ProtobufConfig / protobufRunProtoc := (args =>
+    com.github.os72.protocjar.Protoc.runProtoc("-v3.17.3" +: args.toArray)
   )
 )
 
@@ -98,7 +92,7 @@ lazy val releaseSettings = Seq(
   releaseCrossBuild := true,
   releasePublishArtifactsAction := PgpKeys.publishSigned.value,
   publishMavenStyle := true,
-  publishArtifact in Test := false,
+  Test / publishArtifact := false,
   publishTo := Some(
     if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging
   ),
@@ -161,7 +155,7 @@ lazy val ratatoolCommon = project
       "com.google.guava" % "guava" % guavaVersion
     ),
     // In case of scalacheck failures print more info
-    testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3")
+    Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3")
   )
   .enablePlugins(ProtobufPlugin)
   .settings(protoBufSettings)
@@ -185,8 +179,8 @@ lazy val ratatoolSampling = project
       "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
     ),
     // In case of scalacheck failures print more info
-    testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3"),
-    parallelExecution in Test := false
+    Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3"),
+    Test / parallelExecution := false
   )
   .enablePlugins(ProtobufPlugin)
   .dependsOn(
@@ -211,8 +205,8 @@ lazy val ratatoolDiffy = project
       "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
     ),
     // In case of scalacheck failures print more info
-    testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3"),
-    parallelExecution in Test := false,
+    Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3"),
+    Test / parallelExecution := false,
     libraryDependencies ++= {
       if (isScala213x.value) {
         Seq()
@@ -242,8 +236,8 @@ lazy val ratatoolShapeless = project
       "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
     ),
     // In case of scalacheck failures print more info
-    testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3"),
-    parallelExecution in Test := false
+    Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3"),
+    Test / parallelExecution := false
   )
   .dependsOn(
     ratatoolDiffy,
@@ -260,7 +254,7 @@ lazy val ratatoolCli = project
       "org.scalatest" %% "scalatest" % scalaTestVersion % "test"
     ),
     // In case of scalacheck failures print more info
-    testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3")
+    Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "3")
   )
   .enablePlugins(ProtobufPlugin, PackPlugin)
   .dependsOn(

ratatool-sampling/src/test/scala/com/spotify/ratatool/samplers/BigSamplerParquetTest.scala

@@ -52,7 +52,7 @@ class BigSamplerParquetTest extends PipelineSpec with BeforeAndAfterAll {
 
     // Read all shards of output
     val sampledRecords = new File(output).listFiles().map(ParquetIO.readFromFile).toSeq.flatten
-    sampledRecords.size should (be <= 60 and be >= 40)
+    sampledRecords.size should (be <= 65 and be >= 35)
     all(sampledRecords.map(_.get("id").asInstanceOf[Int])) should (be < 100 and be >= 0)
   }
 }