From ee2581cc3a9fe927c5772fd7d75f40cb9c8dddfd Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Mon, 21 Nov 2022 11:03:53 +0530 Subject: [PATCH 1/3] Dependencies upgraded for both mac M1 and Intel chip --- build.sbt | 4 ++-- project/Dependencies.scala | 2 +- project/plugins.sbt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index c519fda59..9e140e157 100644 --- a/build.sbt +++ b/build.sbt @@ -113,8 +113,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 := "-v3.21.7" ) lazy val corePublishSettings = Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 32bba8c3b..1063034c2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,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", diff --git a/project/plugins.sbt b/project/plugins.sbt index 38f8de3ba..db6bd96b6 100644 --- a/project/plugins.sbt +++ b/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") @@ -20,7 +20,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0") -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.4") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.18") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4") From bc21d26aa3c6e63b1e1aeb05a26984c632ed7df5 Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Mon, 21 Nov 2022 12:50:19 +0530 Subject: [PATCH 2/3] update --- project/Dependencies.scala | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1063034c2..64674417f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,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" % "3.21.7", + "com.google.protobuf" % "protobuf-java" % "3.15.8", "dnsjava" % "dnsjava" % "3.4.2", "org.apache.commons" % "commons-lang3" % "3.4", "org.apache.commons" % "commons-text" % "1.4", diff --git a/project/plugins.sbt b/project/plugins.sbt index db6bd96b6..28cea0f96 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -20,7 +20,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0") -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.18") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.4") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4") From 95f6e72c4a898f14077d84b3e0f6703d295701be Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Tue, 4 Mar 2025 15:46:29 +0530 Subject: [PATCH 3/3] update Signed-off-by: Jay07GIT --- DEVELOPER_GUIDE.md | 55 -------------------------------------- build.sbt | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index 146bc58b9..8e6837502 100644 --- a/DEVELOPER_GUIDE.md +++ b/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: diff --git a/build.sbt b/build.sbt index 9e140e157..b9b5ea48c 100644 --- a/build.sbt +++ b/build.sbt @@ -114,7 +114,7 @@ lazy val coreBuildSettings = Seq( // 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("3.21.7") -> (sourceManaged in Compile).value), - PB.protocVersion := "-v3.21.7" + PB.protocVersion := "3.21.7" ) lazy val corePublishSettings = Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 64674417f..1063034c2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,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" % "3.15.8", + "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",