Skip to content

Commit

Permalink
Revert "chore(build): Remove init-publish script (#1579)" (#1580)
Browse files Browse the repository at this point in the history
This reverts commit fd2ef27.
  • Loading branch information
plumpy authored Mar 24, 2020
1 parent fd2ef27 commit c148061
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
8 changes: 2 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "com.netflix.spinnaker.gradle:spinnaker-dev-plugin:$spinnakerGradleVersion"
classpath 'com.netflix.spinnaker.gradle:spinnaker-dev-plugin:6.5.0'
if (Boolean.valueOf(enablePublishing)) {
classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:$spinnakerGradleVersion"
classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:6.5.0"
}
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
}
Expand All @@ -40,10 +40,6 @@ allprojects {
apply plugin: 'java-library'
apply plugin: 'groovy'

if (Boolean.valueOf(enablePublishing)) {
apply plugin: 'spinnaker.project'
}

test {
testLogging {
showStandardStreams = false
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#Fri Mar 20 17:17:39 UTC 2020
enablePublishing=false
spinnakerGradleVersion=7.7.0
korkVersion=7.29.1
org.gradle.parallel=true
14 changes: 14 additions & 0 deletions gradle/init-publish.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
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

0 comments on commit c148061

Please sign in to comment.