Skip to content

Commit 5ca52e1

Browse files
jabrenajabrena
committed
Example review for issue:
ev3dev-lang-java/ev3dev-lang-java#300
1 parent eab2204 commit 5ca52e1

File tree

17 files changed

+486
-58
lines changed

17 files changed

+486
-58
lines changed

‎ev3dev-lang-java/build.gradle‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//Gradle file library ev3dev-lang-java / examples
22
//Author: Juan Antonio Breña Moral
33

4-
version = '0.6.1-RELEASE'
4+
version = '0.6.1'
55

66
apply plugin: 'java'
77
apply plugin: 'eclipse'
@@ -13,12 +13,19 @@ repositories {
1313
}
1414

1515
dependencies {
16-
compile("com.github.ev3dev-lang-java:ev3dev-lang-java:v0.6.0")
16+
compile("com.github.ev3dev-lang-java:ev3dev-lang-java:v0.6.1")
1717
compile("com.github.ev3dev-lang-java:lejos-navigation:v0.1.0")
1818

1919
compile("ch.qos.logback:logback-classic:1.2.3")
2020
}
2121

22+
//Wrapper
23+
task wrapper(type: Wrapper) {
24+
description = 'Generates gradlew[.bat] scripts'
25+
gradleVersion = '3.5'
26+
}
27+
28+
2229
//Compile
2330
compileJava {
2431
sourceCompatibility = 1.8
@@ -28,18 +35,29 @@ compileJava {
2835
//Jar
2936
jar {
3037
baseName = "${rootProject.name}"
31-
}
32-
33-
//Fat Jar
34-
task fatJar(type: Jar) {
35-
baseName = "${rootProject.name}" + "-all"
3638
manifest {
3739
from file("${projectDir}/src/main/resources/META-INF/MANIFEST.MF")
3840
}
39-
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
40-
with jar
4141
}
4242

43+
buildscript {
44+
repositories {
45+
jcenter()
46+
}
47+
dependencies {
48+
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.0'
49+
}
50+
}
51+
52+
//Fat Jar
53+
apply plugin: 'com.github.johnrengelman.shadow'
54+
55+
task fatJar << {
56+
57+
}
58+
fatJar.dependsOn shadowJar
59+
60+
4361
//Deploy on Brick
4462
buildscript {
4563
repositories {

‎ev3dev-lang-java/config.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
remotes {
3+
ev3dev {
4+
host = '192.168.1.206'
5+
user = 'robot'
6+
password = 'maker'
7+
}
8+
}

‎ev3dev-lang-java/deploy.gradle‎

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11

2-
remotes {
3-
ev3dev {
4-
host = '192.168.1.180'
5-
user = 'robot'
6-
password = 'maker'
7-
}
8-
}
9-
102
task deploy << {
113
ssh.run {
124
session(remotes.ev3dev) {
13-
put from: "./build/libs/" + "${rootProject.name}" + "-all-" + version + ".jar", into: "/home/robot/"
5+
put from: "./build/libs/" + "${rootProject.name}" + "-" + version + "-all.jar", into: "/home/robot/"
146
}
157
}
168
}
@@ -19,13 +11,59 @@ deploy.dependsOn clean, fatJar
1911
task remoteRun << {
2012
ssh.run {
2113
session(remotes.ev3dev) {
22-
println "java -server -jar /home/robot/" + "${rootProject.name}" + "-all-" + version + ".jar"
23-
execute "java -server -jar /home/robot/" + "${rootProject.name}" + "-all-" + version + ".jar"
14+
println "java -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all.jar "
15+
execute "java -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all.jar "
16+
}
17+
}
18+
}
19+
20+
task remoteSudoRun << {
21+
ssh.run {
22+
session(remotes.ev3dev) {
23+
println "echo -e \"maker\" | sudo -S java -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all" + ".jar"
24+
execute "echo -e \"maker\" | sudo -S java -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all" + ".jar"
25+
}
26+
}
27+
}
28+
29+
task remoteProfilingRun << {
30+
ssh.run {
31+
session(remotes.ev3dev) {
32+
println "java -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=7091 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all.jar "
33+
execute "java -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=7091 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all.jar "
34+
}
35+
}
36+
}
37+
38+
task remoteProfilingSudoRun << {
39+
ssh.run {
40+
session(remotes.ev3dev) {
41+
println "echo -e \"maker\" | sudo -S java -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=7091 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all.jar "
42+
execute "echo -e \"maker\" | sudo -S java -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=7091 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -server -jar /home/robot/" + "${rootProject.name}" + "-" + version + "-all.jar "
2443
}
2544
}
2645
}
2746

2847
task deployAndRun << {
2948

3049
}
31-
deployAndRun.dependsOn deploy, remoteRun
50+
deployAndRun.dependsOn deploy, remoteRun
51+
52+
53+
task deployAndSudoRun << {
54+
55+
}
56+
deployAndSudoRun.dependsOn deploy, remoteSudoRun
57+
58+
task deployAndProfilingRun << {
59+
60+
}
61+
deployAndProfilingRun.dependsOn deploy, remoteProfilingRun
62+
63+
task deployAndProfilingSudoRun << {
64+
65+
}
66+
deployAndProfilingSudoRun.dependsOn deploy, remoteProfilingSudoRun
67+
68+
apply from: 'config.gradle'
69+

‎ev3dev-lang-java/gradle/wrapper/gradle-wrapper.jar‎

53.5 KB
Binary file not shown.

‎ev3dev-lang-java/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Sun Jun 18 09:55:32 BST 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

‎ev3dev-lang-java/gradlew‎

Lines changed: 172 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)