Skip to content

Commit 461e148

Browse files
JongChernJongChern
committed
dont merge with me please unless u are called Alex
1 parent 1c1bf52 commit 461e148

11 files changed

Lines changed: 187 additions & 28 deletions

File tree

‎ShimmerDriver/.classpath‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" path="src/main/java">
4-
<attributes>
5-
<attribute name="FROM_GRADLE_MODEL" value="true"/>
6-
</attributes>
7-
</classpathentry>
8-
<classpathentry kind="src" path="src/test/java">
9-
<attributes>
10-
<attribute name="FROM_GRADLE_MODEL" value="true"/>
11-
</attributes>
12-
</classpathentry>
13-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
14-
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
15-
<classpathentry kind="output" path="bin"/>
16-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/test/java"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
7+
<classpathentry kind="output" path="bin"/>
8+
</classpath>

‎ShimmerDriver/.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
build.commands=org.eclipse.jdt.core.javabuilder
2-
connection.arguments=
3-
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
4-
connection.java.home=null
5-
connection.jvm.arguments=
6-
connection.project.dir=../../ConsensysApps/OtherConsensysApps
7-
derived.resources=.gradle,build
8-
eclipse.preferences.version=1
9-
natures=org.eclipse.jdt.core.javanature
10-
project.path=\:ShimmerDriver
1+
build.commands=org.eclipse.jdt.core.javabuilder
2+
connection.arguments=
3+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
4+
connection.java.home=null
5+
connection.jvm.arguments=
6+
connection.project.dir=../../Shimmer-Advance-API/ShimmerBluetoothManager
7+
derived.resources=.gradle,build
8+
eclipse.preferences.version=1
9+
natures=org.eclipse.jdt.core.javanature
10+
project.path=\:ShimmerDriver

‎ShimmerDriver/api/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build/

‎ShimmerDriver/api/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>api</name>
4+
<comment>Project api created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

‎ShimmerDriver/build.gradle‎

Lines changed: 97 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
apply plugin: 'java'
22
apply plugin: 'eclipse'
33
apply plugin: 'maven'
4-
archivesBaseName = 'ShimmerDriverML'
4+
apply plugin: 'maven-publish'
5+
apply plugin: 'com.jfrog.bintray'
6+
archivesBaseName = 'ShimmerDriver'
57

68
/*Rev0.2
79
* - fixes for shimmer2r and writeSensors not working after streaming
810
*/
9-
version = '0.3'
11+
version = '0.4b'
1012

13+
group = 'com.shimmerresearch.driver'
14+
15+
16+
17+
buildscript {
18+
repositories {
19+
jcenter()
20+
}
21+
dependencies {
22+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
23+
}
24+
}
1125

1226
repositories {
1327
jcenter()
@@ -21,6 +35,87 @@ sourceSets {
2135
main
2236
}
2337

38+
39+
// custom tasks for creating source/javadoc jars
40+
task sourcesJar(type: Jar, dependsOn: classes) {
41+
classifier = 'sources'
42+
from sourceSets.main.allSource
43+
}
44+
45+
task javadocJar(type: Jar, dependsOn: javadoc) {
46+
classifier = 'javadoc'
47+
from javadoc.destinationDir
48+
}
49+
50+
// add javadoc/source jar tasks as artifacts
51+
artifacts {
52+
archives sourcesJar, javadocJar
53+
}
54+
55+
publishing {
56+
publications {
57+
mavenJava(MavenPublication) {
58+
if (plugins.hasPlugin('war')) {
59+
from components.web
60+
} else {
61+
from components.java
62+
}
63+
64+
artifact sourcesJar
65+
//artifact javadocJar
66+
}
67+
}
68+
}
69+
70+
bintray {
71+
user = bintray_username //this usually comes from gradle.properties file in ~/.gradle
72+
key = bintray_api_key //this usually comes from gradle.properties file in ~/.gradle
73+
74+
// configurations = ['deployables'] //When uploading configuration files
75+
// - OR -
76+
publications = ['mavenJava'] //When uploading Maven-based publication files
77+
// - AND/OR -
78+
// filesSpec { //When uploading any arbitrary files ('filesSpec' is a standard Gradle CopySpec)
79+
// from 'arbitrary-files'
80+
// into 'standalone_files/level1'
81+
// rename '(.+)\\.(.+)', '$1-suffix.$2'
82+
// }
83+
dryRun = false //Whether to run this as dry-run, without deploying
84+
publish = true //If version should be auto published after an upload
85+
pkg {
86+
// repo = 'myrepo'
87+
repo = 'testshimmer'
88+
name = 'shimmerdriver'
89+
// userOrg = 'myorg' //An optional organization name when the repo belongs to one of the user's orgs
90+
desc = 'what a fantastic package indeed!'
91+
websiteUrl = 'https://github.com/bintray/bintray-examples'
92+
issueTrackerUrl = 'https://github.com/bintray/bintray-examples/issues'
93+
vcsUrl = 'https://github.com/JongChern/ShimmerTest'
94+
licenses = ['Apache-2.0']
95+
labels = ['example', 'gradle', 'bintray']
96+
publicDownloadNumbers = true
97+
attributes= ['a': ['ay1', 'ay2'], 'b': ['bee'], c: 'cee'] //Optional package-level attributes
98+
//Optional version descriptor
99+
version {
100+
name = project.version //Bintray logical version name
101+
desc = 'optional, version-specific description'
102+
// released = 'optional, date of the version release' //2 possible values: date in the format of 'yyyy-MM-dd'T'HH:mm:ss.SSSZZ' OR a java.util.Date instance
103+
// vcsTag = '1.3.0'
104+
// attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin'] //Optional version-level attributes
105+
// gpg {
106+
// sign = true //Determines whether to GPG sign the files. The default is false
107+
// passphrase = 'passphrase' //Optional. The passphrase for GPG signing'
108+
// }
109+
mavenCentralSync {
110+
sync = false //Optional (true by default). Determines whether to sync the version to Maven Central.
111+
user = 'userToken' //OSS user token
112+
password = 'paasword' //OSS user password
113+
close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
114+
}
115+
}
116+
}
117+
}
118+
24119
/*
25120
sourceSets {
26121
main {

‎ShimmerDriver/services/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build/

‎ShimmerDriver/services/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>services</name>
4+
<comment>Project services created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

‎ShimmerDriver/services/webservice/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build/

‎ShimmerDriver/services/webservice/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>webservice</name>
4+
<comment>Project webservice created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

‎ShimmerDriver/shared/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build/

0 commit comments

Comments
 (0)