From 40dd1d8e9cc60fb1dd6a3351db502cd4160d829b Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 4 Jul 2023 15:59:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20chore:=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B7=A5=E7=A8=8B=E9=80=82=E9=85=8Dapple=20s?= =?UTF-8?q?ilicon=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f9c687731c..052b2e40cc 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,13 @@ allprojects { testImplementation 'junit:junit:4.12' } - if (OperatingSystem.current().isMacOsX()) { + // 目前开发工程适配 mac_x64, mac_aarch64, windows_x64 + if (OperatingSystem.current().isMacOsX() && "aarch64".equals(System.getProperty("os.arch"))) { + dependencies { + // jxbrowser 6.23不支持M1,因此没有本地库,但是6.23jar还是需要留着,用来兼容 + implementation "com.fr.third:jxbrowser-mac-arm-v7:${jxBrowserVersion}" + } + } else if (OperatingSystem.current().isMacOsX()) { dependencies { implementation 'com.fr.third:jxbrowser-mac:6.23' implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}"