Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Gradle updates for build ordering

Rich Turner17c2ef2cabe3
diff --git a/gradle.properties b/gradle.properties
index 07d0b45c1..b1ff068cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,7 +30,7 @@ hikaricpVersion = 2.7.2
junitVersion = 4.12
spockVersion = 1.3-groovy-2.5
byteBuddyVersion = 1.9.3
-objenesisVersion = 2.2
+objenesisVersion = 2.6
camelVersion = 2.19.0
tyrusVersion = 1.10
sunriseSunsetCalculatorVersion = 1.2
diff --git a/project.gradle b/project.gradle
index 343e7887c..2a60cbc9d 100644
--- a/project.gradle
+++ b/project.gradle
@@ -102,6 +102,7 @@ task npmClean(type: Exec){
commandLine npmCommand("npm"), "run-script", "clean"
}
task npmBuild(type: Exec){
+ mustRunAfter npmClean
dependsOn tasks.getByPath(":yarnInstall")
commandLine npmCommand("npm"), "run-script", "build"
}
diff --git a/test/build.gradle b/test/build.gradle
index c4341aa2e..f90258d29 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -14,7 +14,7 @@ dependencies {
compile "org.glassfish.tyrus:tyrus-client:$tyrusVersion"
compile "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"
compile "org.objenesis:objenesis:$objenesisVersion"
- testRuntime "net.bytebuddy:byte-buddy:$byteBuddyVersion"
+ compile "net.bytebuddy:byte-buddy:$byteBuddyVersion"
// We must have this on the regular classpath because we do weird
// things with GWT in tests, but without the transitive runtime
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
index de8fd3593..30238df40 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
@@ -188,7 +188,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
def "Handle asset create, update, delete"() {
given: "expected conditions"
- def conditions = new PollingConditions(timeout: 10, initialDelay: 0.5, delay: 0.5)
+ def conditions = new PollingConditions(timeout: 15, initialDelay: 0.5, delay: 0.5)
and: "the container is started"
def serverPort = findEphemeralPort()