Skip to content

Commit 23dce0f

Browse files
authored
0.63.0
- Automatic module names for JPMS - Remove POC module - Move public apis to dslink-v2-api - DSNode.equals->equivalent. Equals and hashCode now use the default Object implementations.
1 parent 8118e1d commit 23dce0f

File tree

186 files changed

+530
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+530
-819
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
**test.json
3030
**/*.log.*.zip
3131
/dslink-v2/dslink.jks
32-
/dslink-v2-poc/dslink.jks
32+
/dslink-v2-api/dslink.jks

README.md

Lines changed: 60 additions & 13 deletions

build.gradle

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,24 @@ subprojects {
55
apply plugin: 'maven'
66

77
group 'org.iot-dsa'
8-
version '0.62.1'
9-
10-
sourceCompatibility = 1.8
11-
targetCompatibility = 1.8
8+
version '0.63.0'
9+
10+
targetCompatibility = JavaVersion.VERSION_1_8
11+
sourceCompatibility = JavaVersion.VERSION_1_8
1212

1313
repositories {
1414
mavenLocal()
1515
jcenter()
1616
}
1717

18+
jar {
19+
manifest {
20+
attributes(
21+
'Automatic-Module-Name' : 'org.iot.dsa.' + project.name.replaceAll('-','.')
22+
)
23+
}
24+
}
25+
1826
task sourcesJar(group: 'build', type: Jar, dependsOn: classes) {
1927
classifier = 'sources'
2028
from sourceSets.main.allJava
@@ -25,6 +33,10 @@ subprojects {
2533
from javadoc.destinationDir
2634
}
2735

36+
test {
37+
useTestNG()
38+
}
39+
2840
jacocoTestReport {
2941

3042
reports {
@@ -45,5 +57,5 @@ allprojects {
4557
}
4658

4759
wrapper {
48-
gradleVersion = '5.4'
60+
gradleVersion = '5.4.1'
4961
}

dslink-v2-api/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
artifacts {
2+
archives sourcesJar
3+
archives javadocJar
4+
}

dslink-v2/src/main/java/org/iot/dsa/conn/DSConnection.java renamed to dslink-v2-api/src/main/java/org/iot/dsa/conn/DSConnection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ protected void onStable() {
326326
*/
327327
protected void startUpdateTimer() {
328328
if (updateTimer == null) {
329-
updateTimer = DSRuntime.run(() -> updateState(), System.currentTimeMillis(), getUpdateInterval());
329+
updateTimer = DSRuntime
330+
.run(() -> updateState(), System.currentTimeMillis(), getUpdateInterval());
330331
}
331332
}
332333

0 commit comments

Comments
 (0)