Skip to content

Commit dc7712f

Browse files
ennioViscoennioVisco
authored
build: tools update (#34)
* fix: updated bike example * build: updated gradle and sonarqube * build: updated build deps * build: updated sonar * ci: updated actions * ci: updated actions * ci: typo fix * ci: minor actions updates
1 parent d397980 commit dc7712f

16 files changed

Lines changed: 132 additions & 95 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
os: [ macos-latest, windows-latest, ubuntu-latest ]
1111
runs-on: ${{ matrix.os }}
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1616
- name: Set up JDK 21
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v5
1818
with:
1919
java-version: 21
2020
distribution: adopt
@@ -23,7 +23,7 @@ jobs:
2323
run: ./gradlew --no-daemon build
2424

2525
- name: Save build cache
26-
uses: actions/cache/save@v3
26+
uses: actions/cache/save@v5
2727
with:
2828
path: ./build
2929
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}
@@ -38,49 +38,44 @@ jobs:
3838
runs-on: ${{ matrix.os }}
3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v6
4242
- name: Set up JDK 21
43-
uses: actions/setup-java@v3
43+
uses: actions/setup-java@v5
4444
with:
4545
java-version: 21
4646
distribution: adopt
4747
cache: gradle
4848
- name: Restore build cache
49-
uses: actions/cache/restore@v3
49+
uses: actions/cache/restore@v5
5050
with:
5151
path: ./build
5252
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}
5353
- name: Gradle check
5454
run: ./gradlew --no-daemon check
55-
- name: Save tests cache
56-
uses: actions/cache/save@v3
57-
with:
58-
path: ./build
59-
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}
6055

6156
analyze:
6257
name: Static code analysis
6358
needs: test
6459
runs-on: ubuntu-latest
6560
steps:
6661
- name: Checkout
67-
uses: actions/checkout@v3
62+
uses: actions/checkout@v6
6863
with:
6964
fetch-depth: 0 # Shallow clones
7065
- name: Set up JDK 21
71-
uses: actions/setup-java@v3
66+
uses: actions/setup-java@v5
7267
with:
7368
java-version: 21
7469
distribution: adopt
7570
cache: gradle
7671
- name: Restore tests cache
77-
uses: actions/cache/restore@v3
72+
uses: actions/cache/restore@v5
7873
with:
7974
path: ./build
8075
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}
8176

8277
- name: Cache SonarCloud packages
83-
uses: actions/cache@v3
78+
uses: actions/cache@v5
8479
with:
8580
path: ./.sonar/cache
8681
key: ${{ runner.os }}-sonar
@@ -92,7 +87,7 @@ jobs:
9287
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9388
run: ./gradlew --no-daemon analyze
9489
- name: Codecov update
95-
uses: codecov/codecov-action@v3
90+
uses: codecov/codecov-action@v5
9691
with:
9792
token: "d76dfcb2-9baa-40e4-b07a-4b2647bcf3c4" # should be moved to ${{ secrets.CODECOV_TOKEN }}
9893
files: "./build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml"

‎.github/workflows/docs.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Pull code
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v6
2727
with:
2828
persist-credentials: false
2929
- name: Set up JDK
30-
uses: actions/setup-java@v3
30+
uses: actions/setup-java@v5
3131
with:
3232
java-version: 21
3333
distribution: adopt
3434
cache: gradle
3535
- name: Build documentation
3636
run: ./gradlew --no-daemon docs # --no-configuration-cache
3737
- name: Save built docs
38-
uses: actions/cache/save@v3
38+
uses: actions/cache/save@v5
3939
with:
4040
path: docs
4141
key: ${{ github.sha }}-${{ github.workflow }}
@@ -50,19 +50,19 @@ jobs:
5050
runs-on: ubuntu-latest
5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v3
53+
uses: actions/checkout@v6
5454
- name: Restore built docs
55-
uses: actions/cache/restore@v3
55+
uses: actions/cache/restore@v5
5656
with:
5757
path: docs
5858
key: ${{ github.sha }}-${{ github.workflow }}
5959
- name: Setup Pages
60-
uses: actions/configure-pages@v3
60+
uses: actions/configure-pages@v5
6161
- name: Upload artifact
62-
uses: actions/upload-pages-artifact@v1
62+
uses: actions/upload-pages-artifact@v4
6363
with:
6464
# Upload entire repository
6565
path: 'docs'
6666
- name: Deploy to GitHub Pages
6767
id: deployment
68-
uses: actions/deploy-pages@v2
68+
uses: actions/deploy-pages@v4

‎.github/workflows/publish.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
newRelease: ${{ steps.nyx-infer.outputs.newVersion }}
1515
newVersion: ${{ steps.nyx-infer.outputs.newRelease }}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0
2020
- name: Run nyx Infer
2121
id: nyx-infer
22-
uses: mooltiverse/nyx-github-action@main
22+
uses: mooltiverse/nyx@v3
2323
with:
2424
command: 'infer'
2525
configurationFile: 'build-logic/releases/.nyx.json'
2626
resume: 'true'
2727
- name: Run nyx Make
28-
uses: mooltiverse/nyx-github-action@main
28+
uses: mooltiverse/nyx@v3
2929
with:
3030
command: 'make'
3131
configurationFile: 'build-logic/releases/.nyx.json'
@@ -37,11 +37,11 @@ jobs:
3737
runs-on: ubuntu-latest
3838
needs: infer-version
3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v6
4141
with:
4242
fetch-depth: 0
4343
- name: Set up JDK 21
44-
uses: actions/setup-java@v3
44+
uses: actions/setup-java@v5
4545
with:
4646
java-version: 21
4747
distribution: adopt
@@ -55,7 +55,7 @@ jobs:
5555
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
5656
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
5757
- name: Nyx publish
58-
uses: mooltiverse/nyx-github-action@main
58+
uses: mooltiverse/nyx@v3
5959
env:
6060
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6161
NYX_RELEASE_TYPES_PUBLICATION_SERVICES: 'GITHUB'
@@ -78,10 +78,10 @@ jobs:
7878
contents: read
7979
packages: write
8080
steps:
81-
- uses: actions/checkout@v3
81+
- uses: actions/checkout@v6
8282

8383
- name: Set up JDK 21
84-
uses: actions/setup-java@v2
84+
uses: actions/setup-java@v5
8585
with:
8686
java-version: 21
8787
distribution: adopt
@@ -97,7 +97,7 @@ jobs:
9797
- name: Build releasable python package
9898
run: ./gradlew --no-daemon :python:distribute
9999

100-
- uses: actions/setup-python@v4
100+
- uses: actions/setup-python@v6
101101
with:
102102
python-version: '3.8'
103103
- run: pipx install poetry
@@ -116,7 +116,7 @@ jobs:
116116
runs-on: ubuntu-latest
117117
needs: [ publish-jvm, infer-version ]
118118
steps:
119-
- uses: actions/checkout@v3
119+
- uses: actions/checkout@v6
120120
- name: Find and Replace
121121
uses: jacobtomlinson/gha-find-replace@v3
122122
with:

‎build-logic/code-info/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// regardless of the specific projects and languages
44
plugins {
55
`kotlin-dsl` // To compile the plugin code
6-
id("org.sonarqube") version "4.4.1.3373"
6+
id("org.sonarqube") version "7.2.2.6593"
77
}
88

99
dependencies {
10-
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929")
10+
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.2.2.6593")
1111
}

‎build-logic/generate-docs/build.gradle.kts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
// This plugin generates the website with the docs
33
plugins {
44
`kotlin-dsl` // To compile the plugin code
5-
kotlin("jvm")
65
id("org.jetbrains.dokka")
76
}
87

98
dependencies {
10-
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
11-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
12-
dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10")
9+
implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.1.0")
10+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21")
1311
}

‎build-logic/generate-docs/src/main/kotlin/io.github.moonlightsuite.generate-docs.gradle.kts‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
plugins {
2-
kotlin("jvm") // for compiling the docs
32
id("org.jetbrains.dokka")
43
}
54

6-
dependencies {
7-
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
8-
dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10")
9-
}
10-
115
tasks.register("docs") {
12-
dependsOn(":dokkaHtmlMultiModule")
13-
}
14-
15-
// == HTML javadoc settings ==
16-
tasks.withType<org.jetbrains.dokka.gradle.DokkaMultiModuleTask> {
17-
outputDirectory.set(rootDir.resolve("docs"))
18-
19-
}
20-
21-
tasks.named("docs") {
22-
dependsOn(":dokkaHtmlMultiModule")
6+
dependsOn(":dokkaGenerate")
237
}

‎build-logic/java-library/src/main/kotlin/io.github.moonlightsuite.java-library.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ tasks {
2828
// == Testing settings ==
2929
dependencies {
3030
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
31+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
3132
}
3233

3334
tasks.test {

‎build-logic/settings.gradle.kts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pluginManagement {
99
}
1010

1111
plugins {
12-
kotlin("jvm") version "1.9.21" apply false // for compiling the docs
13-
id("org.jetbrains.dokka") version "1.9.10" apply false
12+
kotlin("jvm") version "2.2.21" apply false // for compiling the docs
13+
id("org.jetbrains.dokka") version "2.1.0" apply false
1414
}
1515
}
1616

@@ -25,8 +25,6 @@ dependencyResolutionManagement {
2525
// Required to remove annoying warning in subprojects
2626
plugins {
2727
`kotlin-dsl` apply false
28-
29-
kotlin("jvm") version "1.9.20-RC2" apply false // TODO: remove when 1.9.20 is released
3028
}
3129

3230
// We aggregate all the build logic in a single project

‎gradle.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Gradle config
22
org.gradle.caching=true
33
org.gradle.parallel=true
4-
org.gradle.configuration-cache=true # TODO: broken in Dokka, hopefully they will fix
5-
org.gradle.kotlin.dsl.allWarningsAsErrors=true
6-
kotlin.incremental=true
4+
#org.gradle.configuration-cache=true
5+
org.gradle.configuration-cache-problems=warn
76
# Project info
87
project.name=moonlight
98
project.group=io.github.moonlightsuite

‎gradle/wrapper/gradle-wrapper.jar‎

-19.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)