update dependencies and use gradle nexus publish plugin (#26)

PixelOutlaw · Aug 8, 2021 · 5226a83 · 5226a83
1 parent 0374533
commit 5226a83
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 367 deletions.
diff --git a/.github/cdk/.gitignore b/.github/cdk/.gitignore
diff --git a/.github/cdk/cdkactions.yaml b/.github/cdk/cdkactions.yaml
diff --git a/.github/cdk/main.ts b/.github/cdk/main.ts
diff --git a/.github/cdk/package.json b/.github/cdk/package.json
diff --git a/.github/cdk/tsconfig.json b/.github/cdk/tsconfig.json
diff --git a/.github/cdk/yarn.lock b/.github/cdk/yarn.lock
diff --git a/.github/workflows/cdkactions_prepare-for-release.yaml b/.github/workflows/cdkactions_prepare-for-release.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Make Gradle Wrapper Executable
         run: chmod +x ./gradlew
       - name: Set Gradle Version
-        run: ./gradlew wrapper --gradle-version 7.0.2
+        run: ./gradlew wrapper --gradle-version 7.1.1
       - name: Test Plugin Directly with Gradle
         run: ../gradlew check
         working-directory: pixeloutlaw-gradle-plugin

diff --git a/.github/workflows/cdkactions_pull-request.yaml b/.github/workflows/cdkactions_pull-request.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         gradle:
-          - 7.0.2
+          - 7.1.1
         java:
           - "8"
           - "11"

diff --git a/.github/workflows/cdkactions_validate.yaml b/.github/workflows/cdkactions_validate.yaml
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 ## Prerequisites
 
-This plugin only works with versions of Gradle >= 7.0.2.
+This plugin only works with versions of Gradle >= 7.1.1.
 
 ## Gradle Projects
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,15 +1,10 @@
 plugins {
-    kotlin("jvm") version "1.5.10" apply false
+    kotlin("jvm") version "1.5.21" apply false
     id("io.pixeloutlaw.gradle")
-//    id("io.pixeloutlaw.spigot.build")
 }
 
-//spigotBuildTools {
-//    versions = listOf("1.16.4")
-//}
-
 tasks.withType<Wrapper>().configureEach {
-    version = "7.0.2"
+    version = "7.1.1"
     doLast {
         copy {
             from(propertiesFile)

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.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pixeloutlaw-gradle-plugin/build.gradle.kts b/pixeloutlaw-gradle-plugin/build.gradle.kts
@@ -32,11 +32,8 @@ dependencies {
     implementation("com.netflix.nebula:nebula-project-plugin:_")
     implementation("com.netflix.nebula:gradle-contacts-plugin:_")
 
-    // maven central staging plugin
-    implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:_")
-
-    // nexus publish plugin
-    implementation("de.marcphilipp.gradle:nexus-publish-plugin:_")
+    // gradle nexus publish plugin
+    implementation("io.github.gradle-nexus:publish-plugin:_")
 
     // test logger plugin
     implementation("com.adarshr:gradle-test-logger-plugin:_")