Skip to content

feat(protocol/protoc): support macOS ARM64 natively compile #6502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuny0707 merged 1 commit into from
Dec 30, 2025
+19 −6
Merged

feat(protocol/protoc): support macOS ARM64 natively compile #6502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import org.gradle.nativeplatform.platform.internal.Architectures
import org.gradle.internal.os.OperatingSystem
allprojects {
version = "1.0.0"
apply plugin: "java-library"
Expand All @@ -10,6 +11,7 @@ def arch = System.getProperty("os.arch").toLowerCase()
def javaVersion = JavaVersion.current()
def isArm64 = Architectures.AARCH64.isAlias(arch)
def archSource = isArm64 ? "arm" : "x86"
def isMac = OperatingSystem.current().isMacOsX()

ext.archInfo = [
name : arch,
Expand All @@ -29,7 +31,11 @@ ext.archInfo = [
],
requires: [
JavaVersion: isArm64 ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8,
RocksdbVersion: isArm64 ? '9.7.4' : '5.15.10'
RocksdbVersion: isArm64 ? '9.7.4' : '5.15.10',
// https://github.com/grpc/grpc-java/issues/7690
// https://github.com/grpc/grpc-java/pull/12319, Add support for macOS aarch64 with universal binary
// https://github.com/grpc/grpc-java/pull/11371 , 1.64.x is not supported CentOS 7.
ProtocGenVersion: isArm64 && isMac ? '1.76.0' : '1.60.0'
],
VMOptions: isArm64 ? "${rootDir}/gradle/jdk17/java-tron.vmoptions" : "${rootDir}/gradle/java-tron.vmoptions"
]
Expand Down
14 changes: 11 additions & 3 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,9 +853,9 @@
<artifact name="libp2p-2.2.7.module">
<sha256 value="8dcf317770be76db50d2f5dd694f5b0edba98e2bf147626d9b49bbd888669689" origin="Generated by Gradle"/>
</artifact>
<artifact name="libp2p-2.2.7.pom">
<sha256 value="91ddb2a384207b401efa0d68b84f06ff9151fce8843e1ece3e5cf63875c1cd84" origin="Generated by Gradle"/>
</artifact>
<artifact name="libp2p-2.2.7.pom">
<sha256 value="91ddb2a384207b401efa0d68b84f06ff9151fce8843e1ece3e5cf63875c1cd84" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.github.tronprotocol" name="zksnark-java-sdk" version="1.0.0">
<artifact name="zksnark-java-sdk-1.0.0.jar">
Expand Down Expand Up @@ -954,6 +954,14 @@
<sha256 value="e82d7256d7230aac0fc8276f57c96e3b98ad6fcda8a074fe7d4935ee21cb7008" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.grpc" name="protoc-gen-grpc-java" version="1.76.0">
<artifact name="protoc-gen-grpc-java-1.76.0-osx-aarch_64.exe">
<sha256 value="8100c67d1ea547fc34dd638db20876921349df99c42608fdfdcf1cef15c1d6ff" origin="Generated by Gradle"/>
</artifact>
<artifact name="protoc-gen-grpc-java-1.76.0.pom">
<sha256 value="d5a8d2cf3dfaa0f04c8eabcef91ec7ae68cb516a701fbbae84236526c02f3570" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.netty" name="netty-buffer" version="4.1.124.Final">
<artifact name="netty-buffer-4.1.124.Final.jar">
<sha256 value="830580f29c425c97bf01ae8ec69e96f4ec425f6b0c6a497c3803f261d69a2647" origin="Generated by Gradle"/>
Expand Down
3 changes: 1 addition & 2 deletions protocol/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.google.protobuf'

def protobufVersion = '3.25.8'
def grpcVersion = '1.75.0'
def protocGenVersion = '1.60.0' // https://github.com/grpc/grpc-java/pull/11371 , 1.64.x is not supported CentOS 7.

dependencies {
api group: 'com.google.protobuf', name: 'protobuf-java', version: protobufVersion
Expand Down Expand Up @@ -47,7 +46,7 @@ protobuf {

plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${protocGenVersion}"
artifact = "io.grpc:protoc-gen-grpc-java:${rootProject.archInfo.requires.ProtocGenVersion}"
}
}
generateProtoTasks {
Expand Down