File tree Expand file tree Collapse file tree 3 files changed +22
-9
lines changed Expand file tree Collapse file tree 3 files changed +22
-9
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ static def isX86() {
11
11
12
12
static def isArm64 () {
13
13
def arch = System . getProperty(" os.arch" ). toLowerCase()
14
- return new Architectures.KnownArchitecture ( " arm64 " , " aarch64 " ) . isAlias(arch)
14
+ return Architectures . AARCH64 . isAlias(arch)
15
15
}
16
16
17
17
if (isArm64() && ! JavaVersion . current(). is(JavaVersion . VERSION_17 )) {
Original file line number Diff line number Diff line change
1
+ import org.gradle.nativeplatform.platform.internal.Architectures
2
+
1
3
plugins {
2
4
id " org.gradle.test-retry" version " 1.5.9"
3
5
id " org.sonarqube" version " 2.6"
@@ -34,6 +36,11 @@ task version(type: Exec) {
34
36
commandLine ' bash' , ' -c' , ' ../ver.sh'
35
37
}
36
38
39
+ static def isArm64 () {
40
+ def arch = System . getProperty(" os.arch" ). toLowerCase()
41
+ return Architectures . AARCH64 . isAlias(arch)
42
+ }
43
+
37
44
dependencies {
38
45
// local libraries
39
46
implementation fileTree(dir : ' libs' , include : ' *.jar' )
@@ -122,6 +129,18 @@ test {
122
129
destinationFile = file(" $buildDir /jacoco/jacocoTest.exec" )
123
130
classDumpDir = file(" $buildDir /jacoco/classpathdumps" )
124
131
}
132
+ if (isArm64()) {
133
+ exclude { element ->
134
+ element. file. name. toLowerCase(). contains(' leveldb' )
135
+ }
136
+ exclude(' org/tron/program/DBConvertTest' )
137
+ filter {
138
+ excludeTestsMatching ' *.*leveldb*'
139
+ excludeTestsMatching ' *.*Leveldb*'
140
+ excludeTestsMatching ' *.*LevelDB*'
141
+ excludeTestsMatching ' *.*LevelDb*'
142
+ }
143
+ }
125
144
if (isWindows()) {
126
145
exclude ' **/ShieldedTransferActuatorTest.class'
127
146
exclude ' **/BackupDbUtilTest.class'
Original file line number Diff line number Diff line change @@ -10,21 +10,15 @@ static def isX86() {
10
10
11
11
static def isArm64 () {
12
12
def arch = System . getProperty(" os.arch" ). toLowerCase()
13
- return new Architectures.KnownArchitecture ( " arm64 " , " aarch64 " ) . isAlias(arch)
13
+ return Architectures . AARCH64 . isAlias(arch)
14
14
}
15
15
16
16
if (isX86()) {
17
17
ext {
18
- leveldbGroup = " org.fusesource.leveldbjni"
19
- leveldbName = " leveldbjni-all"
20
- leveldbVersion = " 1.8"
21
18
rocksDBVersion = " 5.15.10"
22
19
}
23
20
} else if (isArm64()) {
24
21
ext {
25
- leveldbGroup = " com.halibobor"
26
- leveldbName = " leveldbjni-all"
27
- leveldbVersion = " 1.18.3"
28
22
rocksDBVersion = " 7.7.3"
29
23
}
30
24
} else {
@@ -45,7 +39,7 @@ sourceSets {
45
39
}
46
40
47
41
dependencies {
48
- api group : leveldbGroup , name : leveldbName , version : leveldbVersion
42
+ api group : ' org.fusesource.leveldbjni ' , name : ' leveldbjni-all ' , version : ' 1.8 '
49
43
api group : ' org.rocksdb' , name : ' rocksdbjni' , version : rocksDBVersion
50
44
}
51
45
You can’t perform that action at this time.
0 commit comments