From 408dc3d4578aae47eadb0a4858a701c3e40b6ce2 Mon Sep 17 00:00:00 2001 From: duanledexianxianxian Date: Mon, 14 Oct 2019 08:32:31 +0800 Subject: [PATCH] sync --- build.gradle | 8 +++--- gradle/wrapper/gradle-wrapper.properties | 16 +++++------ module1/build.gradle | 5 ---- plugin-gradle/build.gradle | 27 +++++++++++++++++++ .../src/main/resources/META-INF/plugin.xml | 24 +++++++++++++++++ settings.gradle | 1 + 6 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 plugin-gradle/build.gradle create mode 100644 plugin-gradle/src/main/resources/META-INF/plugin.xml diff --git a/build.gradle b/build.gradle index 3abd6b2..9b79ca2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,14 @@ plugins { group 'com.duanledexianxianxian' version '1.0-SNAPSHOT' -sourceCompatibility = 1.8 -repositories { - mavenCentral() + +allprojects { + sourceCompatibility = 1.8 } dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' + compile group: 'org.projectlombok', name: 'lombok', version: '1.18.10' + compile group: 'com.mchange', name: 'c3p0', version: '0.9.5.4' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1b5490..81fa09b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,10 +1,6 @@ -#Fri Oct 11 15:26:34 CST 2019 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -#distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip -# local -distributionUrl=file\:///D:/gradle-5.4.1-all.zip -# 其他连接 - +#Sun Oct 13 23:56:21 CST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/module1/build.gradle b/module1/build.gradle index 3abd6b2..d76db67 100644 --- a/module1/build.gradle +++ b/module1/build.gradle @@ -5,11 +5,6 @@ plugins { group 'com.duanledexianxianxian' version '1.0-SNAPSHOT' -sourceCompatibility = 1.8 - -repositories { - mavenCentral() -} dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/plugin-gradle/build.gradle b/plugin-gradle/build.gradle new file mode 100644 index 0000000..4921506 --- /dev/null +++ b/plugin-gradle/build.gradle @@ -0,0 +1,27 @@ +plugins { + id 'java' + id 'org.jetbrains.intellij' version '0.4.10' +} + +group 'com.duanledexianxianxian' +version '1.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version '2019.1' +} +patchPluginXml { + changeNotes """ + Add change notes here.
+ most HTML tags may be used""" +} \ No newline at end of file diff --git a/plugin-gradle/src/main/resources/META-INF/plugin.xml b/plugin-gradle/src/main/resources/META-INF/plugin.xml new file mode 100644 index 0000000..8e6f3ac --- /dev/null +++ b/plugin-gradle/src/main/resources/META-INF/plugin.xml @@ -0,0 +1,24 @@ + + com.duanledexianxianxian.plugin-gradle + Plugin display name here + YourCompany + + + most HTML tags may be used + ]]> + + + + + + + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a364991..2c0e4cd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ rootProject.name = 'gradle-example' include 'module1' +include 'plugin-gradle' -- GitLab