Skip to content

Commit 9f0e4d4

Browse files
Clean up buildscript ext.
1 parent 322bc7e commit 9f0e4d4

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ buildscript {
1111
def versionPostFixValue = project.findProperty('versionPostFix')
1212
def versionPostFix = versionPostFixValue ? "-$versionPostFixValue" : ''
1313
ob_version = objectboxVersionNumber + (objectboxVersionRelease? "" : "$versionPostFix-SNAPSHOT")
14-
println "ObjectBox Java version $ob_version"
1514

16-
// Core version for tests
15+
// Native library version for tests
1716
// Be careful to diverge here; easy to forget and hard to find JNI problems
18-
ob_native_version = objectboxVersionNumber + (objectboxVersionRelease? "": "-dev-SNAPSHOT")
19-
17+
def nativeVersion = objectboxVersionNumber + (objectboxVersionRelease? "": "-dev-SNAPSHOT")
2018
def osName = System.getProperty("os.name").toLowerCase()
21-
objectboxPlatform = osName.contains('linux') ? 'linux'
19+
def objectboxPlatform = osName.contains('linux') ? 'linux'
2220
: osName.contains("windows")? 'windows'
2321
: osName.contains("mac")? 'macos'
2422
: 'unsupported'
23+
ob_native_dep = "io.objectbox:objectbox-$objectboxPlatform:$nativeVersion"
24+
25+
junit_version = '4.13'
2526

26-
objectboxNativeDependency = "io.objectbox:objectbox-$objectboxPlatform:$ob_native_version"
27-
println "ObjectBox native dependency: $objectboxNativeDependency"
27+
println "version=$ob_version"
28+
println "objectboxNativeDependency=$ob_native_dep"
2829
}
29-
ext.junit_version = '4.13'
3030

3131
repositories {
3232
mavenCentral()

tests/objectbox-java-test/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ dependencies {
2727

2828
// Check flag to use locally compiled version to avoid dependency cycles
2929
if (!project.hasProperty('noObjectBoxTestDepencies') || !noObjectBoxTestDepencies) {
30-
println "Using $objectboxNativeDependency"
31-
compile "$objectboxNativeDependency"
30+
println "Using $ob_native_dep"
31+
compile ob_native_dep
3232
} else {
3333
println "Did NOT add native dependency"
3434
}

tests/test-proguard/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ dependencies {
2727

2828
// Check flag to use locally compiled version to avoid dependency cycles
2929
if (!project.hasProperty('noObjectBoxTestDepencies') || !noObjectBoxTestDepencies) {
30-
println "Using $objectboxNativeDependency"
31-
compile "$objectboxNativeDependency"
30+
println "Using $ob_native_dep"
31+
compile ob_native_dep
3232
} else {
3333
println "Did NOT add native dependency"
3434
}

0 commit comments

Comments
 (0)