upgrade gradle version to 4.x

SmartDengg · Apr 19, 2021 · ae1a7d4 · ae1a7d4
1 parent a10fb5b
commit ae1a7d4
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 13 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -8,9 +8,9 @@ buildscript {
     maven { url 'https://jitpack.io' }
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.6.3'
+    classpath 'com.android.tools.build:gradle:4.1.3'
     classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    classpath 'com.github.SmartDengg.asm-clickdebounce:click-debounce-gradle-plugin:2.0.0'
+//    classpath 'com.github.SmartDengg.asm-clickdebounce:click-debounce-gradle-plugin:2.0.0'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -9,13 +9,13 @@ repositories {
 dependencies {
   implementation localGroovy()
   implementation gradleApi()
-  implementation "com.android.tools.build:gradle:3.6.3"
+  implementation 'com.android.tools.build:gradle:4.1.3'
 }
 
-//sourceSets {
-//  main {
-//    groovy.srcDirs = ['src/main/groovy', '../click-debounce-gradle-plugin/src/main/groovy']
-//    java.srcDirs = ['src/main/java', '../click-debounce-gradle-plugin/src/main/java']
-//    resources.srcDirs = ['src/main/resources', '../click-debounce-gradle-plugin/src/main/resources']
-//  }
-//}
+sourceSets {
+  main {
+    groovy.srcDirs = ['src/main/groovy', '../click-debounce-gradle-plugin/src/main/groovy']
+    java.srcDirs = ['src/main/java', '../click-debounce-gradle-plugin/src/main/java']
+    resources.srcDirs = ['src/main/resources', '../click-debounce-gradle-plugin/src/main/resources']
+  }
+}
diff --git a/...-debounce-gradle-plugin/src/main/groovy/com/smartdengg/plugin/DebounceGradlePlugin.groovy b/...-debounce-gradle-plugin/src/main/groovy/com/smartdengg/plugin/DebounceGradlePlugin.groovy
@@ -45,6 +45,10 @@ class DebounceGradlePlugin implements Plugin<Project> {
       url "https://jitpack.io"
     }
 
+    println()
+    println "\033[1;31m #### 欢迎使用 click-debounce 编译插件，任何疑问请联系 [email protected] #### \033[0m"
+    println()
+
     //    project.configurations.implementation.dependencies.add(
     //        project.dependencies.create(project.rootProject.findProject("click-debounce-runtime")))
 

diff --git a/click-debounce-gradle-plugin/src/main/groovy/com/smartdengg/plugin/OutputMappingTask.groovy b/click-debounce-gradle-plugin/src/main/groovy/com/smartdengg/plugin/OutputMappingTask.groovy
@@ -60,6 +60,8 @@ class OutputMappingTask extends DefaultTask {
     Files.asCharSink(file, Charsets.UTF_8).write("")
     PrintWriter writer = PrintWriterUtil.createPrintWriterOut(file)
 
+    if (wovenClasses.empty) return
+
     try {
       wovenClasses.findAll {
         it.hasDebouncedMethod()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 12 15:06:54 CST 2020
+#Mon Apr 19 21:38:51 CST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip