diff --git a/.editorconfig b/.editorconfig index 39ecae64..9c662bca 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,3 @@ trim_trailing_whitespace = false [*.{yml,json}] indent_size = 2 - -[doc/legal/LICENSE_lwjgl3.md] -insert_final_newline = false diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 60745c2c..eea4f225 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -21,7 +21,7 @@ jobs: java: [ 22 ] - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest, windows-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -30,7 +30,6 @@ jobs: with: java-version: | ${{ matrix.java }} - 21 distribution: 'temurin' - name: Grant execute permission for gradlew if: ${{ runner.os != 'Windows' }} @@ -38,13 +37,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - name: Execute Gradle build - run: ./gradlew build -# - name: Upload build reports -# uses: actions/upload-artifact@v4 -# with: -# name: build-reports-${{ matrix.java }}-${{ runner.os }} -# path: | -# modules/**/build/reports/ + run: ./gradlew build --parallel - name: Capture build artifacts if: ${{ runner.os == 'Linux' && matrix.java == '22' }} uses: actions/upload-artifact@v4 diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml index bfc33346..6c500a84 100644 --- a/.github/workflows/javadoc.yml +++ b/.github/workflows/javadoc.yml @@ -26,7 +26,6 @@ jobs: with: java-version: | 22 - 21 distribution: 'temurin' - name: Grant execute permission for gradlew if: ${{ runner.os != 'Windows' }} diff --git a/gradle.properties b/gradle.properties index 83a306fe..d076e5d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,3 +21,4 @@ kotlinTargetJdkVersion=21 overrunMarshalVersion=0.1.0-alpha.28-jdk22 overrunPlatformVersion=1.0.0 +jomlVersion=1.10.8 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c352119..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e..9355b415 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/modules/overrungl.joml/build.gradle.kts b/modules/overrungl.joml/build.gradle.kts index 76856d78..48035195 100644 --- a/modules/overrungl.joml/build.gradle.kts +++ b/modules/overrungl.joml/build.gradle.kts @@ -1,3 +1,5 @@ +val jomlVersion: String by project + dependencies { - api("org.joml:joml:1.10.5") + api("org.joml:joml:$jomlVersion") }