Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
os: [ macos-latest, windows-latest, ubuntu-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
java-version: 21
distribution: adopt
Expand All @@ -23,7 +23,7 @@ jobs:
run: ./gradlew --no-daemon build

- name: Save build cache
uses: actions/cache/save@v3
uses: actions/cache/save@v5
with:
path: ./build
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}
Expand All @@ -38,49 +38,44 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
java-version: 21
distribution: adopt
cache: gradle
- name: Restore build cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: ./build
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}
- name: Gradle check
run: ./gradlew --no-daemon check
- name: Save tests cache
uses: actions/cache/save@v3
with:
path: ./build
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}

analyze:
name: Static code analysis
needs: test
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
fetch-depth: 0 # Shallow clones
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
java-version: 21
distribution: adopt
cache: gradle
- name: Restore tests cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: ./build
key: ${{ github.sha }}-${{ github.workflow_id }}-${{ runner.os }}

- name: Cache SonarCloud packages
uses: actions/cache@v3
uses: actions/cache@v5
with:
path: ./.sonar/cache
key: ${{ runner.os }}-sonar
Expand All @@ -92,7 +87,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: ./gradlew --no-daemon analyze
- name: Codecov update
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v5
with:
token: "d76dfcb2-9baa-40e4-b07a-4b2647bcf3c4" # should be moved to ${{ secrets.CODECOV_TOKEN }}
files: "./build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Pull code
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
java-version: 21
distribution: adopt
cache: gradle
- name: Build documentation
run: ./gradlew --no-daemon docs # --no-configuration-cache
- name: Save built docs
uses: actions/cache/save@v3
uses: actions/cache/save@v5
with:
path: docs
key: ${{ github.sha }}-${{ github.workflow }}
Expand All @@ -50,19 +50,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v6
- name: Restore built docs
uses: actions/cache/restore@v3
uses: actions/cache/restore@v5
with:
path: docs
key: ${{ github.sha }}-${{ github.workflow }}
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v4
with:
# Upload entire repository
path: 'docs'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
newRelease: ${{ steps.nyx-infer.outputs.newVersion }}
newVersion: ${{ steps.nyx-infer.outputs.newRelease }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Run nyx Infer
id: nyx-infer
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@v3
with:
command: 'infer'
configurationFile: 'build-logic/releases/.nyx.json'
resume: 'true'
- name: Run nyx Make
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@v3
with:
command: 'make'
configurationFile: 'build-logic/releases/.nyx.json'
Expand All @@ -37,11 +37,11 @@ jobs:
runs-on: ubuntu-latest
needs: infer-version
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Set up JDK 21
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
java-version: 21
distribution: adopt
Expand All @@ -55,7 +55,7 @@ jobs:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
- name: Nyx publish
uses: mooltiverse/nyx-github-action@main
uses: mooltiverse/nyx@v3
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NYX_RELEASE_TYPES_PUBLICATION_SERVICES: 'GITHUB'
Expand All @@ -78,10 +78,10 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Set up JDK 21
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
java-version: 21
distribution: adopt
Expand All @@ -97,7 +97,7 @@ jobs:
- name: Build releasable python package
run: ./gradlew --no-daemon :python:distribute

- uses: actions/setup-python@v4
- uses: actions/setup-python@v6
with:
python-version: '3.8'
- run: pipx install poetry
Expand All @@ -116,7 +116,7 @@ jobs:
runs-on: ubuntu-latest
needs: [ publish-jvm, infer-version ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
- name: Find and Replace
uses: jacobtomlinson/gha-find-replace@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions build-logic/code-info/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// regardless of the specific projects and languages
plugins {
`kotlin-dsl` // To compile the plugin code
id("org.sonarqube") version "4.4.1.3373"
id("org.sonarqube") version "7.2.2.6593"
}

dependencies {
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929")
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.2.2.6593")
}
6 changes: 2 additions & 4 deletions build-logic/generate-docs/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
// This plugin generates the website with the docs
plugins {
`kotlin-dsl` // To compile the plugin code
kotlin("jvm")
id("org.jetbrains.dokka")
}

dependencies {
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.1.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21")
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
plugins {
kotlin("jvm") // for compiling the docs
id("org.jetbrains.dokka")
}

dependencies {
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
dokkaPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10")
}

tasks.register("docs") {
dependsOn(":dokkaHtmlMultiModule")
}

// == HTML javadoc settings ==
tasks.withType<org.jetbrains.dokka.gradle.DokkaMultiModuleTask> {
outputDirectory.set(rootDir.resolve("docs"))

}

tasks.named("docs") {
dependsOn(":dokkaHtmlMultiModule")
dependsOn(":dokkaGenerate")
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ tasks {
// == Testing settings ==
dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks.test {
Expand Down
6 changes: 2 additions & 4 deletions build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ pluginManagement {
}

plugins {
kotlin("jvm") version "1.9.21" apply false // for compiling the docs
id("org.jetbrains.dokka") version "1.9.10" apply false
kotlin("jvm") version "2.2.21" apply false // for compiling the docs
id("org.jetbrains.dokka") version "2.1.0" apply false
}
}

Expand All @@ -25,8 +25,6 @@ dependencyResolutionManagement {
// Required to remove annoying warning in subprojects
plugins {
`kotlin-dsl` apply false

kotlin("jvm") version "1.9.20-RC2" apply false // TODO: remove when 1.9.20 is released
}

// We aggregate all the build logic in a single project
Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Gradle config
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.configuration-cache=true # TODO: broken in Dokka, hopefully they will fix
org.gradle.kotlin.dsl.allWarningsAsErrors=true
kotlin.incremental=true
#org.gradle.configuration-cache=true
org.gradle.configuration-cache-problems=warn
# Project info
project.name=moonlight
project.group=io.github.moonlightsuite
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion python/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fun updateExecutableJar() {
}
}

tasks.create<Delete>("clearArtifacts") {
tasks.register<Delete>("clearArtifacts") {
project.delete(layout.projectDirectory.dir("src/moonlight/jar"))
project.delete(layout.buildDirectory.dir("libs"))
project.delete("dist")
Expand Down
Loading
Loading