diff --git a/build.gradle b/build.gradle index bca01089e4..aac242918a 100644 --- a/build.gradle +++ b/build.gradle @@ -26,9 +26,9 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.netflix.spinnaker.gradle:spinnaker-dev-plugin:6.5.0' + classpath "com.netflix.spinnaker.gradle:spinnaker-dev-plugin:$spinnakerGradleVersion" if (Boolean.valueOf(enablePublishing)) { - classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:6.5.0" + classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:$spinnakerGradleVersion" } classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8' } @@ -40,6 +40,10 @@ allprojects { apply plugin: 'java-library' apply plugin: 'groovy' + if (Boolean.valueOf(enablePublishing)) { + apply plugin: 'spinnaker.project' + } + test { testLogging { showStandardStreams = false diff --git a/gradle.properties b/gradle.properties index 10a6df41e5..c94927cdc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ #Fri Mar 20 17:17:39 UTC 2020 enablePublishing=false +spinnakerGradleVersion=7.7.0 korkVersion=7.29.1 org.gradle.parallel=true diff --git a/gradle/init-publish.gradle b/gradle/init-publish.gradle deleted file mode 100644 index d646f32c0b..0000000000 --- a/gradle/init-publish.gradle +++ /dev/null @@ -1,14 +0,0 @@ -initscript { - repositories { - mavenLocal() - jcenter() - maven { url 'https://dl.bintray.com/spinnaker/gradle/' } - maven { url "https://plugins.gradle.org/m2/" } - } - dependencies { - classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:5.2.2' - } -} - -// Can't use the plugin ID (spinnaker.project) on init scripts for some reason. -apply plugin: com.netflix.spinnaker.gradle.project.SpinnakerProjectPlugin