Merge pull request #1207 from Jay07GIT/dependency_upgrade

Dependencies upgraded for both mac M1 and Intel chip

DEVELOPER_GUIDE.md

@@ -162,61 +162,6 @@ settings for the microsite are also configured in `build.sbt` of the project roo
 VinylDNS can be started in the background by running the [quickstart instructions](README.md#quickstart) located in the
 README. However, VinylDNS can also be run in the foreground.
 
-### Support for M1 Macs
-
-If you are using a Mac running macOS with one of the new Apple M1 chips, you will need to update some dependencies to
-newer versions before attempting to run VinylDNS locally. To verify whether your computer has one of these chips,
-go to About This Mac in the Apple menu in the top-left corner of your screen. If next to Chip you see Apple M1,
-or any later chip such as the Apple M1 Pro or Apple M1 Max, then you will need to apply these changes to the code.
-
-#### build.sbt
-
-Update protoc from version 2.6.1:
-
-```shell
-PB.targets in Compile := Seq(PB.gens.java("2.6.1") -> (sourceManaged in Compile).value),
-PB.protocVersion := "-v261"
-```
-
-to version 3.21.7:
-
-```shell
-PB.targets in Compile := Seq(PB.gens.java("3.21.7") -> (sourceManaged in Compile).value),
-PB.protocVersion := "-v3.21.7"
-```
-
-#### project/build.properties
-
-Update `sbt.version=1.4.0` to `sbt.version=1.7.2`
-
-#### project/Dependencies.scala
-
-Update protobuf from version 2.6.1:
-
-```shell
-"com.google.protobuf"       %  "protobuf-java"                  % "2.6.1",
-```
-
-to version 3.21.7:
-
-```shell
-"com.google.protobuf"       %  "protobuf-java"                  % "3.21.7",
-```
-
-#### project/plugins.sbt
-
-Update the sbt-protoc plugin from version 0.99.18:
-
-```shell
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.18")
-```
-
-to version 1.0.6:
-
-```shell
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
-```
-
 ### Starting the API Server
 
 Before starting the API service, you can start the dependencies for local development:

build.sbt

@@ -116,8 +116,8 @@ lazy val coreBuildSettings = Seq(
   // do not use unused params as NoOpCrypto ignores its constructor, we should provide a way
   // to write a crypto plugin so that we fall back to a noarg constructor
   scalacOptions ++= scalacOptionsByV(scalaVersion.value).filterNot(_ == "-Ywarn-unused:params"),
-  PB.targets in Compile := Seq(PB.gens.java("2.6.1") -> (sourceManaged in Compile).value),
-  PB.protocVersion := "-v261"
+  PB.targets in Compile := Seq(PB.gens.java("3.21.7") -> (sourceManaged in Compile).value),
+  PB.protocVersion := "3.21.7"
 )
 
 lazy val corePublishSettings = Seq(

project/Dependencies.scala

@@ -27,7 +27,7 @@ object Dependencies {
     "com.amazonaws"             %  "aws-java-sdk-core"              % awsV withSources(),
     "com.github.ben-manes.caffeine" % "caffeine"                    % "2.2.7",
     "com.github.cb372"          %% "scalacache-caffeine"            % "0.9.4",
-    "com.google.protobuf"       %  "protobuf-java"                  % "2.6.1",
+    "com.google.protobuf"       %  "protobuf-java"                  % "3.21.7",
     "dnsjava"                   %  "dnsjava"                        % "3.4.2",
     "org.apache.commons"        %  "commons-lang3"                  % "3.4",
     "org.apache.commons"        %  "commons-text"                   % "1.4",

project/plugins.sbt

@@ -2,7 +2,7 @@ logLevel := Level.Warn
 
 resolvers += "Flyway" at "https://flywaydb.org/repo"
 
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.18")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")