Skip to content

Commit

Permalink
fixed 'No support for M1 Macs' #559 (#560)
Browse files Browse the repository at this point in the history 
* fixed No support for M1 Macs #559

* Update src/main/scala/higherkindness/skeuomorph/protobuf/ParseProto.scala

Co-authored-by: Sven Herrmann <sven.herrmann@thatscalaguy.d>
Co-authored-by: Fede Fernández <720923+fedefernandez@users.noreply.github.com>
  • Loading branch information
@ThatScalaGuy @fedefernandez
3 people committed Jan 3, 2022
1 parent f6419aa commit 1addf31
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
7 changes: 5 additions & 2 deletions src/main/scala/higherkindness/skeuomorph/protobuf/ParseProto.scala
View file
Expand Up @@ -41,7 +41,8 @@ object ParseProto {
final case class ProtoSource(
filename: String,
path: String,
importRoot: Option[String] = None
importRoot: Option[String] = None,
protocVersion: Option[String] = None
)

final case class NamedDescriptor[A](
Expand Down Expand Up @@ -87,9 +88,11 @@ object ParseProto {
val protoPaths = input.importRoot
.foldLeft(Array(s"--proto_path=${input.path}"))((arr, i) => arr :+ s"--proto_path=$i")

val version = input.protocVersion.map("-v" + _).toArray

val protoCompilation: F[Int] = Sync[F].delay(
Protoc.runProtoc(
protoPaths ++ Array(
protoPaths ++ version ++ Array(
"--plugin=protoc-gen-proto2_to_proto3",
"--include_imports",
s"--descriptor_set_out=${input.filename}.desc",
Expand Down
29 changes: 15 additions & 14 deletions src/test/scala/higherkindness/skeuomorph/protobuf/ProtobufProtocolSpec.scala
View file
Expand Up @@ -31,13 +31,14 @@ import scala.meta.contrib._

class ProtobufProtocolSpec extends Specification with ScalaCheck {

val workingDirectory: String = new java.io.File(".").getCanonicalPath
val testDirectory = "/src/test/resources/protobuf"
val importRoot: Option[String] = Some(workingDirectory + testDirectory)
val workingDirectory: String = new java.io.File(".").getCanonicalPath
val testDirectory = "/src/test/resources/protobuf"
val importRoot: Option[String] = Some(workingDirectory + testDirectory)
val protocVersion: Option[String] = Some("3.19.1")

val bookProtocol: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/service"
val source = ProtoSource(s"book.proto", path, importRoot)
val source = ProtoSource(s"book.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand Down Expand Up @@ -229,7 +230,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codegenOpencensus = {
val opencensusProtocol: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/models/opencensus"
val source = ProtoSource(s"trace.proto", path, importRoot)
val source = ProtoSource(s"trace.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand Down Expand Up @@ -365,7 +366,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codegenTaggedIntegers = {
val integerTypesProtocol: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/models"
val source = ProtoSource(s"integer_types.proto", path, importRoot)
val source = ProtoSource(s"integer_types.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand Down Expand Up @@ -396,7 +397,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codegenGoogleApi = {
val googleApiProtocol: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/models/type"
val source = ProtoSource(s"date.proto", path, importRoot)
val source = ProtoSource(s"date.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -412,7 +413,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codeGenProtobufOnlyJavaPackage = {
val optionalPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_only_java_package.proto", path, importRoot)
val source = ProtoSource(s"test_only_java_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -435,7 +436,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codegenProtobufNoPackage = {
val optionalPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_no_package.proto", path, importRoot)
val source = ProtoSource(s"test_no_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -458,7 +459,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codeGenProtobufBothPackages = {
val javaPackageAndRegularPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_java_package.proto", path, importRoot)
val source = ProtoSource(s"test_java_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -481,7 +482,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codeGenProtobufEnumWithPackage = {
val enumWithPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_enum_package.proto", path, importRoot)
val source = ProtoSource(s"test_enum_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -506,7 +507,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codeGenProtobufEnumOnlyJavaPackage = {
val enumOnlyJavaPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_enum_only_java_package.proto", path, importRoot)
val source = ProtoSource(s"test_enum_only_java_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -531,7 +532,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codeGenProtobufEnumNoPackage = {
val enumWithNoPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_enum_no_package.proto", path, importRoot)
val source = ProtoSource(s"test_enum_no_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand All @@ -556,7 +557,7 @@ class ProtobufProtocolSpec extends Specification with ScalaCheck {
private def codeGenProtobufEnumBothPackages = {
val enumWithJavaPackageAndRegularPackage: protobuf.Protocol[Mu[ProtobufF]] = {
val path = workingDirectory + s"$testDirectory/packages"
val source = ProtoSource(s"test_enum_java_package.proto", path, importRoot)
val source = ProtoSource(s"test_enum_java_package.proto", path, importRoot, protocVersion)
parseProto[IO, Mu[ProtobufF]].parse(source).unsafeRunSync()
}

Expand Down

0 comments on commit 1addf31

Please sign in to comment.