Upgrade to cst desktop

.github/workflows/java-ci.yml

@@ -0,0 +1,48 @@
+name: Java CI
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        java: [ '8', '11']
+    name: JDK ${{ matrix.Java }} build
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Java
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'adopt'
+          cache: gradle
+      - name: Before Script
+        run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && chmod +x ./cc-test-reporter && ./cc-test-reporter before-build
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+      - name:  Build with Gradle headless
+        uses: GabrielBB/xvfb-action@v1
+        with:
+          run: ./gradlew clean build jacocoTestReport
+      - name: Cleanup Gradle Cache
+        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
+        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties
+      - name: Test & publish code coverage
+        uses: paambaati/[email protected]
+        env:
+          CC_TEST_REPORTER_ID: cd9dce60ab1686b279c6b871d4f5171e3dc3d17426617eb12db6cfee74da898c
+          JACOCO_SOURCE_PATH: "${{github.workspace}}/src/main/java"
+        with:
+          coverageLocations: ${{github.workspace}}/build/reports/jacoco/test/jacocoTestReport.xml:jacoco

README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/CST-Group/meca.svg?branch=master)](https://travis-ci.org/CST-Group/meca) [![Maintainability](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/maintainability)](https://codeclimate.com/github/CST-Group/meca/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/test_coverage)](https://codeclimate.com/github/CST-Group/meca/test_coverage)
+![](https://github.com/CST-Group/meca/actions/workflows/java-ci.yml/badge.svg)
+[![Maintainability](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/maintainability)](https://codeclimate.com/github/CST-Group/meca/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/test_coverage)](https://codeclimate.com/github/CST-Group/meca/test_coverage)
 [![](https://jitpack.io/v/CST-Group/meca.svg?label=Release)](https://jitpack.io/#CST-Group/meca)
 
 # MECA
@@ -28,7 +29,7 @@ Note: This library is still under development, and some concepts or features mig
 ```
 	dependencies {
             ...
-            implementation 'com.github.CST-Group:meca:0.2.1'
+            implementation 'com.github.CST-Group:meca:0.7.0'
 	}
 ```
 
@@ -53,7 +54,7 @@ Sometimes, the version number (tag) in this README gets out of date, as maintain
 	<dependency>
 	    <groupId>com.github.CST-Group</groupId>
 	    <artifactId>meca</artifactId>
-	    <version>0.2.1</version>
+	    <version>0.7.0</version>
 	</dependency>
 ```
 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id 'java-library-distribution'
   	id 'jacoco'
-  	id 'maven'
+  	id 'maven-publish'
 }
 
 group = 'com.github.CST-Group'
@@ -10,44 +10,91 @@ description = "The Multipurpose Enhanced Cognitive Architecture (MECA)"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-version = '0.2.1'
+version = '0.7.0'
 
 repositories {
+    flatDir {
+        dirs '../cst/build/libs'
+    }
     mavenCentral()
     maven { url 'https://jitpack.io' }
-    maven { 
-    	url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
-    }
     maven {
-      url "http://repository.springsource.com/maven/bundles/release"
+        url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
     }
     maven {
-      url "http://repository.springsource.com/maven/bundles/external"
+        url "https://artifacts.camunda.com/artifactory/public/"
     }
 }
 
+configurations {
+    extraLibs
+}
+
 dependencies {
-   api 'com.github.CST-Group:cst:0.3.1'
+   api('com.github.CST-Group:cst-desktop:1.1.0') 
+   api 'org.ros.rosjava_messages:std_msgs:0.5.11'
    testImplementation group: 'junit', name: 'junit', version: '4.12'
    testImplementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
    testImplementation 'org.ros.rosjava_messages:rosjava_test_msgs:0.3.0'
+
+}
+
+// forces all changing dependencies (i.e. SNAPSHOTs) to automagicially download
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
+jar {
+    manifest {
+      attributes(
+        'Class-Path': configurations.runtimeClasspath.files.collect { it.getName() }.join(' ')    
+      )
+    }
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from javadoc
+    from {
+    	configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+    javadoc.options.addStringOption('Xdoclint:none', '-quiet') // this is to avoid complaints about documentation missing parameter description
 }
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
+    from {
+        configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
+
+task uberJar(type: Jar) {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    archiveClassifier = 'full'
+    from sourceSets.main.output
+    dependsOn configurations.runtimeClasspath
+    from {
+        configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
+    }
+    exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
 }
+
 artifacts
 {
-    archives javadocJar, sourcesJar
+    archives javadocJar, sourcesJar, uberJar
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
 }
 
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required = true
     }
-}
+}

gradle.properties

@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+action.custom-1=uberJar
+action.custom-1.args=uberJar

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists