diff --git a/.github/workflows/gradlebuild.yml b/.github/workflows/gradle_build.yml similarity index 53% rename from .github/workflows/gradlebuild.yml rename to .github/workflows/gradle_build.yml index c9bd62f1..6b3376c6 100644 --- a/.github/workflows/gradlebuild.yml +++ b/.github/workflows/gradle_build.yml @@ -7,12 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 16 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v2 with: - java-version: 16 - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file + java-version: 17 + distribution: 'temurin' - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/gradlepublish.yml b/.github/workflows/maven_publish.yml similarity index 72% rename from .github/workflows/gradlepublish.yml rename to .github/workflows/maven_publish.yml index e7902491..56f83838 100755 --- a/.github/workflows/gradlepublish.yml +++ b/.github/workflows/maven_publish.yml @@ -1,4 +1,4 @@ -name: Gradle Package +name: Gradle Maven Publish on: push: @@ -10,12 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 16 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v2 with: - java-version: 16 - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file + java-version: 17 + distribution: 'temurin' # The USERNAME and PASSWORD need to correspond to the credentials environment variables used in # the publishing section of your build.gradle diff --git a/.github/workflows/modrinth_update.yml b/.github/workflows/modrinth_update.yml index 56168bdd..29cccf13 100755 --- a/.github/workflows/modrinth_update.yml +++ b/.github/workflows/modrinth_update.yml @@ -10,12 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 16 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v2 with: - java-version: 16 - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file + java-version: 17 + distribution: 'temurin' - name: Build with Gradle env: diff --git a/build.gradle b/build.gradle index 3fab1329..3d08ee00 100644 --- a/build.gradle +++ b/build.gradle @@ -214,19 +214,6 @@ publishing { name = "LambDynamicLights" description = "Adds dynamic lights to the game." } - - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - - configurations.shadow.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - dependencyNode.appendNode('scope', 'compile') - } - } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a25..e750102e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists