From a425028fd634fb4bba7299385768626c315cfe73 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Tue, 17 Oct 2023 13:35:34 +0200 Subject: [PATCH] Updated build GH workflow. --- .github/workflows/build.yml | 19 ++++++++++++------- .../workflows/gradle-wrapper-validation.yml | 10 ---------- build.gradle | 12 +++++++++--- 3 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d8193e..efee5ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,3 @@ - # Automatically build the project and run any configured tests for every push # and submitted pull request. This can help catch issues that only occur on # certain platforms or Java versions, and provides a first line of defence @@ -11,13 +10,18 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 - - uses: actions/setup-java@v3 + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 17 - - uses: actions/cache@v3 + check-latest: true + - name: Cache Dependencies + uses: actions/cache@v3 with: path: | ~/.gradle/caches @@ -25,9 +29,10 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - name: build + - name: Build with Gradle run: ./gradlew build - - uses: actions/upload-artifact@v3 + - name: Upload Artifacts to GitHub + uses: actions/upload-artifact@v3 with: name: Artifacts path: build/libs/ diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml deleted file mode 100644 index b63fdf3..0000000 --- a/.github/workflows/gradle-wrapper-validation.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: "Validate Gradle Wrapper" -on: [push, pull_request] - -jobs: - validation: - name: "Validation" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 diff --git a/build.gradle b/build.gradle index 2b3d8c6..206aadc 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,11 @@ plugins { id "signing" } -archivesBaseName = project.maven_name -version = project.maven_version -group = project.maven_group +base { + archivesName = project.maven_name + version = project.maven_version + group = project.maven_group +} repositories { mavenCentral() @@ -20,6 +22,10 @@ java { withSourcesJar() withJavadocJar() + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + sourceCompatibility = JavaVersion.VERSION_16 targetCompatibility = JavaVersion.VERSION_16 }