Browse Source

Pull request #4538: KERNEL-7634 gradle 依赖问题

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit 'cc810db9c443b7ef254a22fe3ece78daa34c00cd':
  KERNEL-7634 gradle 依赖问题
feature/10.0
Hades 4 years ago
parent
commit
61bb09f445
  1. 29
      build.gradle

29
build.gradle

@ -28,17 +28,6 @@ dependencies {
api project(':designer-realize') api project(':designer-realize')
} }
configurations.all {
resolutionStrategy {
force 'com.fr.third:jxbrowser:6.23'
force 'com.fr.third:jxbrowser-mac:6.23'
force 'com.fr.third:jxbrowser-win64:6.23'
force 'com.fr.third:jxbrowser:7.5'
force 'com.fr.third:jxbrowser-mac:7.5'
force 'com.fr.third:jxbrowser-win64:7.5'
}
}
allprojects { allprojects {
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'java-library' apply plugin: 'java-library'
@ -68,18 +57,12 @@ allprojects {
} }
dependencies { dependencies {
implementation ('com.fr.third:jxbrowser:6.23') { implementation 'com.fr.third:jxbrowser:6.23'
force = true implementation 'com.fr.third:jxbrowser-mac:6.23'
} implementation 'com.fr.third:jxbrowser-win64:6.23'
implementation ('com.fr.third:jxbrowser-mac:6.23') { implementation 'com.fr.third:jxbrowser-v7:7.5'
force = true implementation 'com.fr.third:jxbrowser-mac-v7:7.5'
} implementation 'com.fr.third:jxbrowser-win64-v7:7.5'
implementation ('com.fr.third:jxbrowser-win64:6.23') {
force = true
}
implementation 'com.fr.third:jxbrowser:7.5'
implementation 'com.fr.third:jxbrowser-mac:7.5'
implementation 'com.fr.third:jxbrowser-win64:7.5'
implementation 'com.fr.third:jxbrowser-swing:7.5' implementation 'com.fr.third:jxbrowser-swing:7.5'
implementation 'com.fr.third.server:servlet-api:3.0' implementation 'com.fr.third.server:servlet-api:3.0'
implementation 'org.swingexplorer:swexpl:2.0.1' implementation 'org.swingexplorer:swexpl:2.0.1'

Loading…
Cancel
Save