Merge pull request #151 from shipkit/sf

Upgraded to Gradle 7 and other dependency versions

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath "org.shipkit:shipkit-auto-version:1.+"
         classpath "org.shipkit:shipkit-changelog:1.+"
-        classpath "com.gradle.publish:plugin-publish-plugin:0.15.0"
+        classpath "com.gradle.publish:plugin-publish-plugin:1.2.1"
     }
 }
 
@@ -38,9 +38,9 @@ dependencies {
 
     testImplementation 'junit:junit:4.13.2'
 
-    testImplementation "org.spockframework:spock-core:1.3-groovy-2.5"
+    testImplementation "org.spockframework:spock-core:2.3-groovy-3.0"
     testImplementation "cglib:cglib-nodep:3.3.0" //mocking concrete classes with spock
-    testImplementation "org.objenesis:objenesis:3.2" //as above
+    testImplementation "org.objenesis:objenesis:3.3" //as above
 
     testImplementation gradleTestKit()
 }

gradle/release.gradle

@@ -1,30 +1,21 @@
 // docs: https://plugins.gradle.org/docs/publish-plugin
 gradlePlugin {
-    plugins {
-        changelog {
-            id = 'org.shipkit.shipkit-changelog'
-            implementationClass = 'org.shipkit.changelog.ChangelogPlugin'
-        }
-        githubRelease {
-            id = 'org.shipkit.shipkit-github-release'
-            implementationClass = 'org.shipkit.github.release.GithubReleasePlugin'
-        }
-    }
-}
-
-pluginBundle {
     website = 'https://github.com/shipkit/shipkit-changelog'
     vcsUrl = 'https://github.com/shipkit/shipkit-changelog.git'
     plugins {
         changelog {
+            id = 'org.shipkit.shipkit-changelog'
+            implementationClass = 'org.shipkit.changelog.ChangelogPlugin'
             displayName = 'Shipkit changelog plugin'
             description = 'Generates changelog based on ticked IDs found in commit messages and Github pull request information'
-            tags = ['ci', 'shipkit', 'changelog']
+            tags.addAll('ci', 'shipkit', 'changelog')
         }
         githubRelease {
+            id = 'org.shipkit.shipkit-github-release'
+            implementationClass = 'org.shipkit.github.release.GithubReleasePlugin'
             displayName = 'Shipkit Github release plugin'
             description = 'Posts a release to Github using the REST API'
-            tags = ['ci', 'shipkit', 'github', 'release']
+            tags.addAll('ci', 'shipkit', 'github', 'release')
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists