From c956f3e01a647901cc9383c0cda18b0c4c4d75be Mon Sep 17 00:00:00 2001 From: rgudwin Date: Thu, 25 Apr 2024 12:45:14 -0300 Subject: [PATCH] Moving to cst 1.4.0 and JSoar 4.1.3 --- .github/workflows/java-ci.yml | 10 +++++----- README.md | 4 ++-- build.gradle | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml index 87fe759..5839260 100644 --- a/.github/workflows/java-ci.yml +++ b/.github/workflows/java-ci.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - java: [ '8', '11'] + java: [ '8', '11', '17'] name: JDK ${{ matrix.Java }} build steps: - - uses: actions/checkout@v3.5.0 + - uses: actions/checkout@v4.1.1 - name: Set up Java - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@v4.2.1 with: java-version: ${{ matrix.java }} distribution: 'adopt' @@ -28,7 +28,7 @@ jobs: - 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@v1.0.6 + uses: gradle/wrapper-validation-action@v3.3.0 - name: Build with Gradle headless uses: coactions/setup-xvfb@v1.0.1 with: @@ -40,7 +40,7 @@ jobs: rm -f ~/.gradle/caches/modules-2/modules-2.lock rm -f ~/.gradle/caches/modules-2/gc.properties - name: Test & publish code coverage - uses: paambaati/codeclimate-action@v3.2.0 + uses: paambaati/codeclimate-action@v5.0.0 env: CC_TEST_REPORTER_ID: e725fad6a6a0b7580271e8183ad773ff705a3b33c5d3a588b940b4f00fa85e69 JACOCO_SOURCE_PATH: "${{github.workspace}}/src/main/java" diff --git a/README.md b/README.md index 2e5ceba..e7dc228 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Note: This library is still under development, and some concepts or features mig ``` dependencies { ... - implementation 'com.github.CST-Group:cst-bindings:1.0.5' + implementation 'com.github.CST-Group:cst-bindings:1.0.6' } ``` @@ -53,7 +53,7 @@ Sometimes, the version number (tag) in this README gets out of date, as maintain com.github.CST-Group cst-bindings - 1.0.5 + 1.0.6 ``` diff --git a/build.gradle b/build.gradle index d619f20..aa9822f 100644 --- a/build.gradle +++ b/build.gradle @@ -34,10 +34,10 @@ configurations { } dependencies { - api('com.github.CST-Group:cst:b786d73') + api('com.github.CST-Group:cst:1.4.0') - api 'com.soartech:jsoar-core:4.1.0' - api 'com.soartech:jsoar-debugger:4.1.0' + api 'com.soartech:jsoar-core:4.1.3' + api 'com.soartech:jsoar-debugger:4.1.3' //api 'org.ros.rosjava_core:rosjava:0.3.6' //implementation 'com.github.rosjava:rosjava_core:0.3.7' api 'com.github.rosjava:rosjava_core:0.3.7' @@ -53,18 +53,18 @@ dependencies { } task javadocJar(type: Jar) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc from { - configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } + configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } } - javadoc.options.addStringOption('Xdoclint:none', '-quiet') + 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) } + configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } } } task uberJar(type: Jar) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists