[ci] Uses recommended way to create task in build.gradle

deepjavalibrary · Mar 9, 2023 · 41ff5d7 · 41ff5d7
1 parent acb0256
commit 41ff5d7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id "nebula.ospackage" version "9.1.1"
+    id 'com.netflix.nebula.ospackage' version '11.0.0'
 }
 
 dependencies {
@@ -91,13 +91,17 @@ tasks.register('benchmark', JavaExec) {
     mainClass = "ai.djl.benchmark.Benchmark"
 }
 
-tasks.register('createDeb', Deb) {
+tasks.register('prepareDeb') {
     dependsOn distTar
     doFirst {
         exec {
             commandLine "tar", "xvf", "${project.buildDir}/distributions/benchmark-${project.version}.tar", "-C", "${project.buildDir}"
         }
     }
+}
+
+tasks.register('createDeb', Deb) {
+    dependsOn prepareDeb
 
     packageName = "djl-bench"
     archiveVersion = "${project.version}"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
diff --git a/plugins/kserve/build.gradle b/plugins/kserve/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     }
 }
 
-task copyJar(type: Copy) {
+tasks.register('copyJar', Copy) {
     from jar // here it automatically reads jar file produced from jar task
     into "../../serving/plugins"
 }

diff --git a/plugins/management-console/build.gradle b/plugins/management-console/build.gradle
@@ -19,12 +19,13 @@ clean {
     }
 }
 
-task buildConsoleApp(type: NpmTask, dependsOn: "npmInstall") {
+tasks.register('buildConsoleApp', NpmTask) {
+    dependsOn "npmInstall"
     project.logger.info("Build the DJL Management console application")
     npmCommand = ["run", "build"]
 }
 
-task copyJar(type: Copy) {
+tasks.register('copyJar', Copy) {
     from jar // here it automatically reads jar file produced from jar task
     into "../../serving/plugins"
 }

diff --git a/plugins/plugin-management-plugin/build.gradle b/plugins/plugin-management-plugin/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     }
 }
 
-task copyJar(type: Copy) {
+tasks.register('copyJar', Copy) {
     from jar // here it automatically reads jar file produced from jar task
     into '../../serving/plugins'
 }

diff --git a/serving/build.gradle b/serving/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id "nebula.ospackage" version "9.1.1"
+    id 'com.netflix.nebula.ospackage' version '11.0.0'
 }
 
 dependencies {
@@ -69,13 +69,17 @@ clean {
     delete file("logs")
 }
 
-tasks.register('createDeb', Deb) {
+tasks.register('prepareDeb') {
     dependsOn distTar
     doFirst {
         exec {
             commandLine "tar", "xvf", "${project.buildDir}/distributions/serving-${project.version}.tar", "-C", "${project.buildDir}"
         }
     }
+}
+
+tasks.register('createDeb', Deb) {
+    dependsOn prepareDeb
 
     packageName = "djl-serving"
     archiveVersion = "${project.version}"