From 9154f97ead1f93da6735852706c7a14d947ace1c Mon Sep 17 00:00:00 2001 From: moweilin Date: Wed, 17 Jan 2024 10:10:27 +0800 Subject: [PATCH] mv package --- README.md | 2 +- {wkube => plugin}/build.gradle | 19 +++++++++++------- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {wkube => plugin}/gradlew | 0 {wkube => plugin}/gradlew.bat | 0 {wkube => plugin}/settings.gradle | 0 .../com/flystem/wukong/grade}/ApplyTask.java | 2 +- .../flystem/wukong/grade}/GenerateTask.java | 2 +- .../flystem/wukong/grade}/ListDataTask.java | 2 +- .../wukong/grade/WukongGradlePlugin.java | 10 ++++----- .../grade/WukongGradlePluginExtension.java | 4 ++-- test/build.gradle | 8 +++++--- test/settings.gradle | 2 +- .../src/main/{kube => wukong}/deployment.yaml | 0 15 files changed, 29 insertions(+), 22 deletions(-) rename {wkube => plugin}/build.gradle (53%) rename {wkube => plugin}/gradle/wrapper/gradle-wrapper.jar (100%) rename {wkube => plugin}/gradle/wrapper/gradle-wrapper.properties (100%) rename {wkube => plugin}/gradlew (100%) rename {wkube => plugin}/gradlew.bat (100%) rename {wkube => plugin}/settings.gradle (100%) rename {wkube/src/main/java/com/flystem/wukong/grade/kube => plugin/src/main/java/com/flystem/wukong/grade}/ApplyTask.java (94%) rename {wkube/src/main/java/com/flystem/wukong/grade/kube => plugin/src/main/java/com/flystem/wukong/grade}/GenerateTask.java (95%) rename {wkube/src/main/java/com/flystem/wukong/grade/kube => plugin/src/main/java/com/flystem/wukong/grade}/ListDataTask.java (89%) rename wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePlugin.java => plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePlugin.java (85%) rename wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePluginExtension.java => plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePluginExtension.java (91%) rename test/src/main/{kube => wukong}/deployment.yaml (100%) diff --git a/README.md b/README.md index d7adc3b..4f00b14 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,4 @@ wKube{ } ``` ## template -Template file path is src/main/wkube/deployment.yaml \ No newline at end of file +Template file path is src/main/wukong/deployment.yaml \ No newline at end of file diff --git a/wkube/build.gradle b/plugin/build.gradle similarity index 53% rename from wkube/build.gradle rename to plugin/build.gradle index e6a9d13..fe4f874 100644 --- a/wkube/build.gradle +++ b/plugin/build.gradle @@ -2,18 +2,23 @@ plugins { id 'java-gradle-plugin' id 'com.gradle.plugin-publish' version '1.2.1' } -group "com.flystem.wukong.kube" +group "com.flystem.wukong.gradle" version "0.0.1" + +java { + sourceCompatibility = '17' +} + gradlePlugin { - website = 'https://github.com/flystem/gradle-kubernetes-plugin' - vcsUrl = 'https://github.com/flystem/gradle-kubernetes-plugin' + website = 'https://github.com/flystem/wukong-gradle-plugin' + vcsUrl = 'https://github.com/flystem/wukong-gradle-plugin' plugins { - WKubePlugin { - id = 'com.flystem.wukong.kube' - implementationClass = 'com.flystem.wukong.grade.kube.WKubePlugin' + WukongGradlePlugin { + id = 'com.flystem.wukong' + implementationClass = 'com.flystem.wukong.grade.WukongGradlePlugin' displayName = 'Plugin for deploy to kubernetes' description = 'A plugin that helps you deploy to kubernetes' - tags.addAll('kubernetes','k8s','kube') + tags.addAll('kubernetes','k8s','kube',"wukong") } } } diff --git a/wkube/gradle/wrapper/gradle-wrapper.jar b/plugin/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from wkube/gradle/wrapper/gradle-wrapper.jar rename to plugin/gradle/wrapper/gradle-wrapper.jar diff --git a/wkube/gradle/wrapper/gradle-wrapper.properties b/plugin/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from wkube/gradle/wrapper/gradle-wrapper.properties rename to plugin/gradle/wrapper/gradle-wrapper.properties diff --git a/wkube/gradlew b/plugin/gradlew similarity index 100% rename from wkube/gradlew rename to plugin/gradlew diff --git a/wkube/gradlew.bat b/plugin/gradlew.bat similarity index 100% rename from wkube/gradlew.bat rename to plugin/gradlew.bat diff --git a/wkube/settings.gradle b/plugin/settings.gradle similarity index 100% rename from wkube/settings.gradle rename to plugin/settings.gradle diff --git a/wkube/src/main/java/com/flystem/wukong/grade/kube/ApplyTask.java b/plugin/src/main/java/com/flystem/wukong/grade/ApplyTask.java similarity index 94% rename from wkube/src/main/java/com/flystem/wukong/grade/kube/ApplyTask.java rename to plugin/src/main/java/com/flystem/wukong/grade/ApplyTask.java index 64b83b5..430c51a 100644 --- a/wkube/src/main/java/com/flystem/wukong/grade/kube/ApplyTask.java +++ b/plugin/src/main/java/com/flystem/wukong/grade/ApplyTask.java @@ -1,4 +1,4 @@ -package com.flystem.wukong.grade.kube; +package com.flystem.wukong.grade; import org.apache.commons.io.FileUtils; import org.gradle.api.DefaultTask; diff --git a/wkube/src/main/java/com/flystem/wukong/grade/kube/GenerateTask.java b/plugin/src/main/java/com/flystem/wukong/grade/GenerateTask.java similarity index 95% rename from wkube/src/main/java/com/flystem/wukong/grade/kube/GenerateTask.java rename to plugin/src/main/java/com/flystem/wukong/grade/GenerateTask.java index 61ea1c9..5662a02 100644 --- a/wkube/src/main/java/com/flystem/wukong/grade/kube/GenerateTask.java +++ b/plugin/src/main/java/com/flystem/wukong/grade/GenerateTask.java @@ -1,4 +1,4 @@ -package com.flystem.wukong.grade.kube; +package com.flystem.wukong.grade; import freemarker.template.Configuration; import freemarker.template.Template; diff --git a/wkube/src/main/java/com/flystem/wukong/grade/kube/ListDataTask.java b/plugin/src/main/java/com/flystem/wukong/grade/ListDataTask.java similarity index 89% rename from wkube/src/main/java/com/flystem/wukong/grade/kube/ListDataTask.java rename to plugin/src/main/java/com/flystem/wukong/grade/ListDataTask.java index 3b0c454..1a3716f 100644 --- a/wkube/src/main/java/com/flystem/wukong/grade/kube/ListDataTask.java +++ b/plugin/src/main/java/com/flystem/wukong/grade/ListDataTask.java @@ -1,4 +1,4 @@ -package com.flystem.wukong.grade.kube; +package com.flystem.wukong.grade; import org.gradle.api.DefaultTask; import org.gradle.api.provider.MapProperty; diff --git a/wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePlugin.java b/plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePlugin.java similarity index 85% rename from wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePlugin.java rename to plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePlugin.java index b9373e3..388bcaf 100644 --- a/wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePlugin.java +++ b/plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePlugin.java @@ -1,4 +1,4 @@ -package com.flystem.wukong.grade.kube; +package com.flystem.wukong.grade; import org.gradle.api.Plugin; @@ -10,8 +10,8 @@ import org.gradle.api.tasks.TaskProvider; import java.util.List; -public class WKubePlugin implements Plugin { - public static final String GROUP_NAME = "wkube"; +public class WukongGradlePlugin implements Plugin { + public static final String GROUP_NAME = "wukong"; public RegularFile defaultTemplateFile(Project project) { return project.getLayout().getProjectDirectory().dir("src").dir("main").dir(GROUP_NAME).file("deployment.yaml"); @@ -26,8 +26,8 @@ public class WKubePlugin implements Plugin { @Override public void apply(Project project) { - WKubePluginExtension extension = - project.getExtensions().create(GROUP_NAME, WKubePluginExtension.class); + WukongGradlePluginExtension extension = + project.getExtensions().create(GROUP_NAME, WukongGradlePluginExtension.class); extension.getTemplateFile().convention(defaultTemplateFile(project)); extension.getDeploymentFile().convention(defaultDeploymentFile(project, extension.getTemplateFile())); diff --git a/wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePluginExtension.java b/plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePluginExtension.java similarity index 91% rename from wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePluginExtension.java rename to plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePluginExtension.java index 94e9824..50170b3 100644 --- a/wkube/src/main/java/com/flystem/wukong/grade/kube/WKubePluginExtension.java +++ b/plugin/src/main/java/com/flystem/wukong/grade/WukongGradlePluginExtension.java @@ -1,4 +1,4 @@ -package com.flystem.wukong.grade.kube; +package com.flystem.wukong.grade; import org.gradle.api.Action; import org.gradle.api.Project; @@ -10,7 +10,7 @@ import org.gradle.api.tasks.Nested; import java.util.HashMap; import java.util.Map; -abstract public class WKubePluginExtension { +abstract public class WukongGradlePluginExtension { /** * kubeconfig in $HOME/.kube directory * @return diff --git a/test/build.gradle b/test/build.gradle index a64596c..123df50 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -1,8 +1,10 @@ plugins { id 'java' - id 'com.flystem.wukong.kube' + id 'com.flystem.wukong' +} +java { + sourceCompatibility = '17' } - repositories { // maven { url 'https://maven.aliyun.com/repository/public/' } mavenCentral() @@ -12,7 +14,7 @@ dependencies { } -wkube{ +wukong{ kubeconfig = "kubeconfig-test.yaml" data{ namespace=getProject().name diff --git a/test/settings.gradle b/test/settings.gradle index 35a2148..dfd7f8b 100644 --- a/test/settings.gradle +++ b/test/settings.gradle @@ -1,3 +1,3 @@ pluginManagement { - includeBuild '../wkube' + includeBuild '../plugin' } \ No newline at end of file diff --git a/test/src/main/kube/deployment.yaml b/test/src/main/wukong/deployment.yaml similarity index 100% rename from test/src/main/kube/deployment.yaml rename to test/src/main/wukong/deployment.yaml