revert to backwards compatible

Author: ldetmer

jib-build-plan/build.gradle

@@ -48,7 +48,7 @@ publishing {
 release {
   tagTemplate = 'v$version-build-plan'
   git {
-    requireBranch.set(/^build-plan-release-v\d+.*$/)
+    requireBranch = /^build-plan-release-v\d+.*$/  //regex
   }
 }
 /* RELEASE */

jib-cli/build.gradle

@@ -61,7 +61,7 @@ release {
     'com.google.cloud.tools:jib-plugins-common',
   ]
   git {
-    requireBranch.set(/^cli-release-v\d+.*$/)
+    requireBranch = /^cli-release-v\d+.*$/  //regex
   }
 }
 

jib-core/build.gradle

@@ -71,7 +71,7 @@ publishing {
 release {
   tagTemplate = 'v$version-core'
   git {
-    requireBranch.set(/^core-release-v\d+.*$/)
+    requireBranch = /^core-release-v\d+.*$/  //regex
   }
 }
 /* RELEASE */

jib-gradle-plugin-extension-api/build.gradle

@@ -44,7 +44,7 @@ publishing {
 release {
   tagTemplate = 'v$version-gradle-extension'
   git {
-    requireBranch.set(/^gradle-extension-release-v\d+.*$/)
+    requireBranch = /^gradle-extension-release-v\d+.*$/  //regex
   }
 }
 /* RELEASE */

jib-gradle-plugin/build.gradle

@@ -3,14 +3,9 @@ buildscript {
     gradlePluginPortal()
   }
   dependencies {
-    // Use version compatible with current Gradle version
-    if (GradleVersion.current() >= GradleVersion.version('7.0')) {
-      classpath 'net.researchgate:gradle-release:3.1.0'
-      classpath 'com.gradle.publish:plugin-publish-plugin:1.2.0'
-    } else {
-      classpath 'net.researchgate:gradle-release:2.8.1'
-      classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0'
-    }
+    // Use Gradle 6.9.2 compatible versions
+    classpath 'net.researchgate:gradle-release:2.8.1'
+    classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0'
   }
 }
 
@@ -68,17 +63,22 @@ dependencies {
 /* RELEASE */
 // Prepare release
 release {
-  tagTemplate = 'v$version-gradle'
+  tagTemplate = 'v$version-gradle-plugin'
   ignoredSnapshotDependencies = [
     'com.google.cloud.tools:jib-core',
     'com.google.cloud.tools:jib-plugins-common',
   ]
   git {
-    requireBranch.set(/^gradle-release-v\d+.*$/)
+    requireBranch = /^gradle-release-v\\d+.*$/  //regex
   }
 }
 // Gradle Plugin Portal releases
-// Try Gradle 7+ syntax first, fall back to Gradle 6 if properties don't exist
+pluginBundle {
+  website = 'https://github.com/GoogleContainerTools/jib/'
+  vcsUrl = 'https://github.com/GoogleContainerTools/jib/'
+  tags = ['google', 'java', 'containers', 'docker', 'kubernetes', 'microservices']
+}
+
 gradlePlugin {
   testSourceSets sourceSets.integrationTest, sourceSets.test
   plugins {
@@ -90,23 +90,6 @@ gradlePlugin {
     }
   }
 }
-try {
-  // Gradle 7+ with plugin-publish 1.x
-  gradlePlugin {
-    website = 'https://github.com/GoogleContainerTools/jib/'
-    vcsUrl = 'https://github.com/GoogleContainerTools/jib/'
-  }
-  gradlePlugin.plugins.jibPlugin {
-    tags = ['google', 'java', 'containers', 'docker', 'kubernetes', 'microservices']
-  }
-} catch (Exception e) {
-  // Gradle 6.x with plugin-publish 0.x
-  pluginBundle {
-    website = 'https://github.com/GoogleContainerTools/jib/'
-    vcsUrl = 'https://github.com/GoogleContainerTools/jib/'
-    tags = ['google', 'java', 'containers', 'docker', 'kubernetes', 'microservices']
-  }
-}
 tasks.publishPlugins.dependsOn build
 /* RELEASE */
 

jib-maven-plugin-extension-api/build.gradle

@@ -44,7 +44,7 @@ publishing {
 release {
   tagTemplate = 'v$version-maven-extension'
   git {
-    requireBranch.set(/^maven-extension-release-v\d+.*$/)
+    requireBranch = /^maven-extension-release-v\d+.*$/  //regex
   }
 }
 /* RELEASE */

jib-maven-plugin/build.gradle

@@ -71,7 +71,7 @@ release {
     'com.google.cloud.tools:jib-plugins-common',
   ]
   git {
-    requireBranch.set(/^maven-release-v\d+.*$/)
+    requireBranch = /^maven-release-v\d+.*$/  //regex
   }
 }
 /* RELEASE */

jib-plugins-extension-common/build.gradle

@@ -38,7 +38,7 @@ publishing {
 release {
   tagTemplate = 'v$version-extension-common'
   git {
-    requireBranch.set(/^extension-common-release-v\d+.*$/)
+    requireBranch = /^extension-common-release-v\d+.*$/  //regex
   }
 }
 /* RELEASE */