Dev

.gitignore

@@ -52,4 +52,6 @@ out/production/ShimmerPCInstrumentDriver/com/shimmerresearch/pcdriver/DockExcept
 JavaShimmerConnect/.settings/org.eclipse.jdt.core.prefs
 ShimmerDriver/.settings/org.eclipse.jdt.core.prefs
 ShimmerAndroidInstrumentDriver/gen/com/shimmerresearch/androidinstrumentdriver/BuildConfig.java
-ShimmerAndroidInstrumentDriver/gen/com/shimmerresearch/androidinstrumentdriver/R.java
+ShimmerAndroidInstrumentDriver/gen/com/shimmerresearch/androidinstrumentdriver/R.java
+gradle.properties
+github.properties

ShimmerBluetoothManager/.classpath

@@ -1,16 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java">
-		<attributes>
-			<attribute name="FROM_GRADLE_MODEL" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/test/java">
-		<attributes>
-			<attribute name="FROM_GRADLE_MODEL" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/java">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

ShimmerBluetoothManager/.settings/org.eclipse.buildship.core.prefs

@@ -3,11 +3,7 @@ connection.arguments=
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.java.home=null
 connection.jvm.arguments=
-<<<<<<< HEAD
-connection.project.dir=../ShimmerDriverPC
-=======
-connection.project.dir=../../Shimmer-Advance-API/ShimmerPCExamples
->>>>>>> refs/heads/Consensys_v1.5.10
+connection.project.dir=../../ConsensysApps/OtherConsensysApps
 derived.resources=.gradle,build
 eclipse.preferences.version=1
 natures=org.eclipse.jdt.core.javanature

ShimmerBluetoothManager/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

ShimmerBluetoothManager/build.gradle

@@ -2,284 +2,68 @@ apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-archivesBaseName = 'ShimmerBluetoothManager'
-group = 'com.shimmerresearch.managers.bluetoothmanager'
-//group = "myorg"
-
-version = '0.9.30beta'
 
+/*
+Rev0.2
+- switch to using jfrog
+*/
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+//This version should match the git release tag
+//version = '0.9.43alpha'
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-    }
-}
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 repositories {
-    jcenter()
     mavenCentral()
-    flatDir {
-       dirs 'libs'
-	   }
-  	maven  {
-		url "http://repository.ops4j.org/maven2/"
-   	}
-}
-
-sourceSets {
-    main
+    mavenLocal()
 }
 
- // custom tasks for creating source/javadoc jars
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
-        from javadoc.destinationDir
-    }
-
-    // add javadoc/source jar tasks as artifacts
-    artifacts {
-        archives sourcesJar, javadocJar
-    }
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
 
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                if (plugins.hasPlugin('war')) {
-                    from components.web
-                } else {
-                    from components.java
-                }
+            groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
+            artifactId = 'shimmerbluetoothmanager' // Replace with the name of your package
+            version = '0.10.0_alpha' // Replace with your package version
 
-                artifact sourcesJar 
-                //artifact javadocJar
-            }
+            // Jar publication
+            //(
+            //artifact sourceJar {
+            //    classifier 'sources'
+            //}
         }
     }
 
-    /*
-    bintray {
-        user = bintray_username //this usually comes from gradle.properties file in ~/.gradle
-        key = bintray_api_key //this usually comes from gradle.properties file in ~/.gradle
-
-//        configurations = ['deployables'] //When uploading configuration files
-        // - OR -
-        publications = ['mavenJava'] //When uploading Maven-based publication files
-        // - AND/OR -
-//        filesSpec { //When uploading any arbitrary files ('filesSpec' is a standard Gradle CopySpec)
-//            from 'arbitrary-files'
-//            into 'standalone_files/level1'
-//            rename '(.+)\\.(.+)', '$1-suffix.$2'
-//        }
-        dryRun = false //Whether to run this as dry-run, without deploying
-        publish = true //If version should be auto published after an upload
-        pkg {
-//            repo = 'myrepo'
-	        repo = 'testshimmer'
-	        name = 'shimmerbluetoothmanager'
-//            userOrg = 'myorg' //An optional organization name when the repo belongs to one of the user's orgs
-            desc = 'what a fantastic package indeed!'
-            websiteUrl = 'https://github.com/bintray/bintray-examples'
-            issueTrackerUrl = 'https://github.com/bintray/bintray-examples/issues'
-            vcsUrl = 'https://github.com/JongChern/ShimmerTest'
-            licenses = ['Apache-2.0']
-            labels = ['example', 'gradle', 'bintray']
-            publicDownloadNumbers = true
-            attributes= ['a': ['ay1', 'ay2'], 'b': ['bee'], c: 'cee'] //Optional package-level attributes
-            //Optional version descriptor
-            version {
-                name = project.version //Bintray logical version name
-                desc = 'optional, version-specific description'
-//                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
-//                vcsTag = '1.3.0'
-//                attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin'] //Optional version-level attributes
-//                gpg {
-//                    sign = true //Determines whether to GPG sign the files. The default is false
-//                    passphrase = 'passphrase' //Optional. The passphrase for GPG signing'
-//                }
-                mavenCentralSync {
-                    sync = false //Optional (true by default). Determines whether to sync the version to Maven Central.
-                    user = 'userToken' //OSS user token
-                    password = 'paasword' //OSS user password
-                    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.
-                }
-            }
-        }
-    }
-    */
-
-    /*
-    bintray {
-        user = shimmer_bintray_username //this usually comes from gradle.properties file in ~/.gradle
-        key = shimmer_bintray_api_key //this usually comes from gradle.properties file in ~/.gradle
-
-//        configurations = ['deployables'] //When uploading configuration files
-        // - OR -
-        publications = ['mavenJava'] //When uploading Maven-based publication files
-        // - AND/OR -
-//        filesSpec { //When uploading any arbitrary files ('filesSpec' is a standard Gradle CopySpec)
-//            from 'arbitrary-files'
-//            into 'standalone_files/level1'
-//            rename '(.+)\\.(.+)', '$1-suffix.$2'
-//        }
-        dryRun = false //Whether to run this as dry-run, without deploying
-        publish = true //If version should be auto published after an upload
-        pkg {
-//            repo = 'myrepo'
-	        repo = 'Shimmer'
-	        name = 'shimmerbluetoothmanager'
-//            userOrg = 'myorg' //An optional organization name when the repo belongs to one of the user's orgs
-            desc = 'this is the bluetooth manager, with no OS specific code'
-            websiteUrl = 'https://github.com/bintray/bintray-examples'
-            issueTrackerUrl = 'https://github.com/bintray/bintray-examples/issues'
-            vcsUrl = 'https://github.com/ShimmerEngineering/Shimmer-Java-Android-API'
-            licenses = ['Apache-2.0']
-            labels = ['example', 'gradle', 'bintray']
-            publicDownloadNumbers = true
-            attributes= ['a': ['ay1', 'ay2'], 'b': ['bee'], c: 'cee'] //Optional package-level attributes
-            //Optional version descriptor
-            version {
-                name = project.version //Bintray logical version name
-                desc = ''
-//                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
-//                vcsTag = '1.3.0'
-//                attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin'] //Optional version-level attributes
-//                gpg {
-//                    sign = true //Determines whether to GPG sign the files. The default is false
-//                    passphrase = 'passphrase' //Optional. The passphrase for GPG signing'
-//                }
-                mavenCentralSync {
-                    sync = false //Optional (true by default). Determines whether to sync the version to Maven Central.
-                    user = 'userToken' //OSS user token
-                    password = 'paasword' //OSS user password
-                    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.
-                }
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/ShimmerEngineering/Shimmer-Java-Android-API")
+            credentials {
+                /* Create gradle.properties file in GRADLE_USER_HOME/.gradle/ 
+                (e.g. C:/Users/YourUsername/.gradle/) with the two lines listed below. Fill in your 
+                Github ID and personal access token - as generated through the Github Developer 
+                Settings page. The token needs to have "read:packages" scope enabled on it: 
+                    gpr.usr=GITHUB_USER_ID 
+                    gpr.key=PERSONAL_ACCESS_TOKEN 
+                */
+                username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+                password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
             }
         }
     }
-    */
-
-/*
-sourceSets.all { set ->
-    def jarTask = task("${set.name}Jar", type: Jar) {
-        baseName = baseName + "-$set.name"
-        from set.output
-    }
-
-    artifacts {
-        archives jarTask
-    }
-}
-
-sourceSets {
-    api
-    impl
-}*/
-
-//create a single Jar with all dependencies
-task fatJar(type: Jar) {
-	manifest {
-        attributes 'Implementation-Title': 'Gradle Jar File Example',  
-        	'Implementation-Version': version,
-        	'Main-Class': 'com.shimmerresearch.driver'
-    }
-    baseName = project.name + '-all'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
 }
 
-//create a single Jar without dependencies
-task singleJar(type: Jar) {
-	manifest {
-        attributes 'Implementation-Title': 'Gradle Jar File Example',  
-        	'Implementation-Version': version,
-        	'Main-Class': 'com.shimmerresearch.driver'
-    }
-    baseName = project.name
-    jar {
-     from sourceSets.main.allSource
- 	}
-    with jar
-}
-
-jar {
-      manifest {
-        attributes 'Implementation-Title': 'Gradle Quickstart',
-                   'Implementation-Version': version
-    }
-}
-
-/*
-jar {
-    from sourceSets.api.output
-    from sourceSets.impl.output
-}
-*/
 
 dependencies {
+    compile 'commons-codec:commons-codec:1.5'
+    compile 'commons-lang:commons-lang:2.6'
+    compile project (':ShimmerDriver')
+
     // Declare the dependency for your favourite test framework you want to use in your tests.
     // TestNG is also supported by the Gradle Test task. Just change the
     // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
     // 'test.useTestNG()' to your build script.
     testCompile 'junit:junit:4.12'
-
-    compile 'commons-codec:commons-codec:1.5'
-    compile 'commons-lang:commons-lang:2.6'
-
-    compile project (':ShimmerDriver')
-    //compile project (':ShimmerAlgorithms')
-
-/*
-    apiCompile 'commons-codec:commons-codec:1.5'
-
-    implCompile sourceSets.api.output
-    implCompile 'commons-lang:commons-lang:2.6'
-
-    testCompile 'junit:junit:4.9'
-    testCompile sourceSets.api.output
-    testCompile sourceSets.impl.output
-    runtime configurations.apiRuntime
-    runtime configurations.implRuntime
-
-    compile project (':ShimmerDriver')
-    compile project (':ShimmerAlgorithms')
-  */  
-}
-
-task wrapper(type: Wrapper) {
-   gradleVersion = '2.14.1' //version required
-}
-/*
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: uri("${buildDir}/repo"))
-
-            addFilter("main") { artifact, file -> artifact.name == project.name }
-            ["api", "impl"].each { type ->
-                addFilter(type) { artifact, file -> artifact.name.endsWith("-$type") }
-
-                // We now have to map our configurations to the correct maven scope for each pom
-                ["compile", "runtime"].each { scope ->
-                    configuration = configurations[type + scope.capitalize()]
-                    ["main", type].each { pomName ->
-                        pom(pomName).scopeMappings.addMapping 1, configuration, scope
-                    }
-                }
-            }
-
-        }
-    }
 }
-*/