Browse Source

Pull request #12367: 无jira任务 Revert "代码工程适配apple silicon架构"

Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0

* commit 'fb19a3d308815467548a524eaca0e3f2dd88d260':
  Revert "无jira任务 代码工程适配apple silicon架构"
release/11.0
vito-刘恒霖 1 year ago
parent
commit
d433b24d4f
  1. 7
      build.gradle

7
build.gradle

@ -93,17 +93,12 @@ allprojects {
testImplementation 'org.powermock:powermock-api-mockito2:1.7.4' testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
} }
// mac_x64, mac_aarch64, windows_x64
if (OperatingSystem.current().isMacOsX()) { if (OperatingSystem.current().isMacOsX()) {
dependencies { dependencies {
implementation 'com.fr.third:jxbrowser-mac:6.23' implementation 'com.fr.third:jxbrowser-mac:6.23'
implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}" implementation "com.fr.third:jxbrowser-mac-v7:${jxBrowserVersion}"
} }
} else if (OperatingSystem.current().isMacOsX() && "aarch64".equals(System.getProperty("os.arch"))) {
dependencies {
implementation 'com.fr.third:jxbrowser-mac:6.23'
implementation "com.fr.third:jxbrowser-mac-arm-v7:${jxBrowserVersion}"
}
} else if (OperatingSystem.current().isWindows()) { } else if (OperatingSystem.current().isWindows()) {
dependencies { dependencies {
implementation 'com.fr.third:jxbrowser-win64:6.23' implementation 'com.fr.third:jxbrowser-win64:6.23'

Loading…
Cancel
Save