Skip to content

Commit

Permalink
Updated various dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ethauvin committed Jul 13, 2024
1 parent 3419e12 commit b989f6f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/bld.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ jobs:

env:
COVERAGE_SDK: "17"
COVERAGE_KOTLIN: "2.0.0"

strategy:
matrix:
java-version: [17, 21, 22]
kotlin-version: [ 1.9.24, 2.0.0 ]

steps:
- name: Checkout source repository
Expand Down Expand Up @@ -48,12 +50,12 @@ jobs:
run: ./bld jacoco

- name: Remove pom.xml
if: success() && matrix.java-version == env.COVERAGE_SDK
if: success() && matrix.java-version == env.COVERAGE_SDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
run: rm -rf pom.xml

- name: SonarCloud Scan
uses: sonarsource/sonarcloud-github-action@master
if: success() && matrix.java-version == env.COVERAGE_SDK
if: success() && matrix.java-version == env.COVERAGE_SDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
10 changes: 5 additions & 5 deletions lib/bld/bld-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5
bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.6
bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.8
bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation=
bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.4
bld.extension-gv=com.uwyn.rife2:bld-generated-version:0.9.8-SNAPSHOT
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.6
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.0-SNAPSHOT
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=1.9.1
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.10.0</version>
<version>3.11.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -48,13 +48,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-vertexai</artifactId>
<version>1.4.0</version>
<version>1.6.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -150,7 +150,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.2</version>
<version>1.18.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
16 changes: 8 additions & 8 deletions src/bld/java/net/thauvin/erik/MobibotBuild.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ public MobibotBuild() {
.include(dependency("org.apache.commons", "commons-lang3", "3.14.0"))
.include(dependency("org.apache.commons", "commons-text", "1.12.0"))
.include(dependency("commons-codec", "commons-codec", "1.17.0"))
.include(dependency("commons-net", "commons-net", "3.10.0"))
.include(dependency("commons-net", "commons-net", "3.11.1"))
// Google
.include(dependency("com.google.code.gson", "gson", "2.11.0"))
.include(dependency("com.google.guava", "guava", "33.2.0-jre"))
.include(dependency("com.google.cloud", "google-cloud-vertexai", "1.4.0"))
.include(dependency("com.google.guava", "guava", "33.2.1-jre"))
.include(dependency("com.google.cloud", "google-cloud-vertexai", "1.6.0"))
// Kotlin
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-common", kotlin))
Expand All @@ -109,7 +109,7 @@ public MobibotBuild() {
.include(dependency("net.aksingh", "owm-japis", "2.5.3.0"))
.include(dependency("net.objecthunter", "exp4j", "0.4.8"))
.include(dependency("org.json", "json", "20240303"))
.include(dependency("org.jsoup", "jsoup", "1.17.2"))
.include(dependency("org.jsoup", "jsoup", "1.18.1"))
// Thauvin
.include(dependency("net.thauvin.erik", "cryptoprice", "1.0.3-SNAPSHOT"))
.include(dependency("net.thauvin.erik", "jokeapi", "0.9.2-SNAPSHOT"))
Expand All @@ -118,8 +118,8 @@ public MobibotBuild() {
scope(test)
.include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 1)))
.include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)));
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3)));

List<String> jars = new ArrayList<>();
runtimeClasspathJars().forEach(f -> jars.add("./lib/" + f.getName()));
Expand Down Expand Up @@ -189,15 +189,15 @@ public void detektBaseline() throws ExitStatusException, IOException, Interrupte
}

@BuildCommand(summary = "Generates JaCoCo Reports")
public void jacoco() throws IOException {
public void jacoco() throws Exception {
new JacocoReportOperation()
.fromProject(this)
.sourceFiles(srcMainKotlin)
.execute();
}

@BuildCommand(value = "release-info", summary = "Generates the ReleaseInfo class")
public void releaseInfo() {
public void releaseInfo() throws Exception {
new GeneratedVersionOperation()
.fromProject(this)
.classTemplate(new File(workDirectory(), "release-info.txt"))
Expand Down

0 comments on commit b989f6f

Please sign in to comment.