Skip to content

Commit 2a53b44

Browse files
committed
Gradle switch to use locally compiled version to avoid dependency cycles
1 parent ffb3217 commit 2a53b44

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

tests/objectbox-java-test/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ dependencies {
99
compile project(':objectbox-java')
1010
compile 'org.greenrobot:essentials:3.0.0-RC1'
1111

12-
if(isLinux64) {
13-
compile "io.objectbox:objectbox-linux:${rootProject.version}"
14-
} else if(isMac64) {
15-
compile "io.objectbox:objectbox-macos:${rootProject.version}"
16-
} else if(isWin64) {
17-
compile "io.objectbox:objectbox-windows:${rootProject.version}"
12+
if (!noObjectBoxTestDepencies) { // Switch to use locally compiled version to avoid dependency cycles
13+
if (isLinux64) {
14+
compile "io.objectbox:objectbox-linux:${rootProject.version}"
15+
} else if (isMac64) {
16+
compile "io.objectbox:objectbox-macos:${rootProject.version}"
17+
} else if (isWin64) {
18+
compile "io.objectbox:objectbox-windows:${rootProject.version}"
19+
}
1820
}
1921

2022
testCompile 'junit:junit:4.12'
@@ -28,7 +30,7 @@ test {
2830
testLogging {
2931
showStandardStreams = true
3032
exceptionFormat = 'full'
31-
displayGranularity=2
33+
displayGranularity = 2
3234
events 'started', 'passed'
3335
}
3436
}

tests/test-proguard/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ dependencies {
99
compile project(':objectbox-java')
1010
compile project(':objectbox-java-api')
1111

12-
if(isLinux64) {
13-
compile "io.objectbox:objectbox-linux:${rootProject.version}"
14-
} else if(isMac64) {
15-
compile "io.objectbox:objectbox-macos:${rootProject.version}"
16-
} else if(isWin64) {
17-
compile "io.objectbox:objectbox-windows:${rootProject.version}"
12+
if (!noObjectBoxTestDepencies) { // Switch to use locally compiled version to avoid dependency cycles
13+
if (isLinux64) {
14+
compile "io.objectbox:objectbox-linux:${rootProject.version}"
15+
} else if (isMac64) {
16+
compile "io.objectbox:objectbox-macos:${rootProject.version}"
17+
} else if (isWin64) {
18+
compile "io.objectbox:objectbox-windows:${rootProject.version}"
19+
}
1820
}
1921

2022
testCompile 'junit:junit:4.12'

0 commit comments

Comments
 (0)