Skip to content

Commit a28f9ff

Browse files
author
Aaron
committed
1.3.4
- Dependency update
1 parent 8a871e7 commit a28f9ff

File tree

2 files changed

+74
-74
lines changed

2 files changed

+74
-74
lines changed

build.gradle

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
apply plugin: 'application'
2-
apply plugin: 'java-library'
3-
apply plugin: 'maven'
4-
5-
// Version is taken from dslink.json
6-
build {
7-
version = new groovy.json.JsonSlurper().parseText(file('dslink.json').text).version
8-
}
9-
10-
group 'org.iot-dsa'
11-
mainClassName = 'org.iot.dsa.dslink.DSLink'
12-
sourceCompatibility = 1.8
13-
targetCompatibility = 1.8
14-
15-
repositories {
16-
jcenter()
17-
mavenLocal()
18-
maven {
19-
url 'https://jitpack.io'
20-
}
21-
}
22-
23-
dependencies {
24-
//api 'org.iot-dsa:dslink-v2-websocket:+' //for a locally installed sdk
25-
api 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:0.75.2'
26-
api 'com.squareup.okhttp3:okhttp:3.14.0'
27-
api 'com.squareup.okhttp3:okhttp-urlconnection:3.8.1'
28-
api 'org.apache.commons:commons-lang3:3.8.1'
29-
implementation 'commons-logging:commons-logging:+'
30-
implementation 'commons-io:commons-io:2.6'
31-
32-
testImplementation 'junit:junit:+'
33-
testImplementation 'org.mockito:mockito-all:+'
34-
}
35-
36-
jar {
37-
manifest {
38-
attributes(
39-
'Automatic-Module-Name' : 'org.iot.dsa.dslink.restadapter'
40-
)
41-
}
42-
}
43-
44-
applicationDistribution.from(new File(project.projectDir, "/dslink.json"))
45-
46-
run {
47-
args System.getProperty("exec.args", "").split()
48-
workingDir project.buildDir
49-
}
50-
51-
wrapper {
52-
gradleVersion = '6.3'
53-
}
1+
apply plugin: 'application'
2+
apply plugin: 'java-library'
3+
apply plugin: 'maven'
4+
5+
// Version is taken from dslink.json
6+
build {
7+
version = new groovy.json.JsonSlurper().parseText(file('dslink.json').text).version
8+
}
9+
10+
group 'org.iot-dsa'
11+
mainClassName = 'org.iot.dsa.dslink.DSLink'
12+
sourceCompatibility = 1.8
13+
targetCompatibility = 1.8
14+
15+
repositories {
16+
jcenter()
17+
mavenLocal()
18+
maven {
19+
url 'https://jitpack.io'
20+
}
21+
}
22+
23+
dependencies {
24+
//api 'org.iot-dsa:dslink-v2-websocket:+' //for a locally installed sdk
25+
api 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:0.75.3'
26+
api 'com.squareup.okhttp3:okhttp:3.14.0'
27+
api 'com.squareup.okhttp3:okhttp-urlconnection:3.8.1'
28+
api 'org.apache.commons:commons-lang3:3.8.1'
29+
implementation 'commons-logging:commons-logging:+'
30+
implementation 'commons-io:commons-io:2.6'
31+
32+
testImplementation 'junit:junit:+'
33+
testImplementation 'org.mockito:mockito-all:+'
34+
}
35+
36+
jar {
37+
manifest {
38+
attributes(
39+
'Automatic-Module-Name' : 'org.iot.dsa.dslink.restadapter'
40+
)
41+
}
42+
}
43+
44+
applicationDistribution.from(new File(project.projectDir, "/dslink.json"))
45+
46+
run {
47+
args System.getProperty("exec.args", "").split()
48+
workingDir project.buildDir
49+
}
50+
51+
wrapper {
52+
gradleVersion = '6.8'
53+
}

dslink.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{
2-
"name": "dslink-java-v2-restadapter",
3-
"version": "1.3.3",
4-
"description": "Java DSA to REST adapter DSLink",
5-
"main": "bin/dslink-java-v2-restadapter",
6-
"configs": {
7-
"main-node": {
8-
"type": "string",
9-
"value": "org.iot.dsa.dslink.restadapter.MainNode"
10-
},
11-
"log": {
12-
"desc": "all, trace, debug, info, warn, error, none",
13-
"type": "enum",
14-
"value": "info"
15-
},
16-
"broker": {
17-
"type": "url",
18-
"value": null
19-
}
20-
}
21-
}
1+
{
2+
"name": "dslink-java-v2-restadapter",
3+
"version": "1.3.4",
4+
"description": "Java DSA to REST adapter DSLink",
5+
"main": "bin/dslink-java-v2-restadapter",
6+
"configs": {
7+
"main-node": {
8+
"type": "string",
9+
"value": "org.iot.dsa.dslink.restadapter.MainNode"
10+
},
11+
"log": {
12+
"desc": "all, trace, debug, info, warn, error, none",
13+
"type": "enum",
14+
"value": "info"
15+
},
16+
"broker": {
17+
"type": "url",
18+
"value": null
19+
}
20+
}
21+
}

0 commit comments

Comments
 (0)