Fix maven publishing, update wrapper, update github actions config.

LambdAurora · Nov 30, 2021 · ab6d0ca · ab6d0ca
1 parent 8d00dc8
commit ab6d0ca
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/.github/workflows/gradlebuild.yml → .github/workflows/gradle_build.yml b/.github/workflows/gradlebuild.yml → .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 → .github/workflows/maven_publish.yml b/.github/workflows/gradlepublish.yml → .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
@@ -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
@@ -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
@@ -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