refactor lint module name

Tencent · Jul 12, 2019 · 570afdb · 570afdb
1 parent b3be801
commit 570afdb
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 12 deletions.
diff --git a/arch/build.gradle b/arch/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     api project(':arch-annotation')
     compileOnly project(':qmui')
     testImplementation 'junit:junit:4.12'
-    lintChecks project(':qmuilintrule')
+    lintChecks project(':lintrule')
 }
 
 // deploy

diff --git a/qmuilint/.gitignore → lint/.gitignore b/qmuilint/.gitignore → lint/.gitignore
diff --git a/qmuilint/build.gradle → lint/build.gradle b/qmuilint/build.gradle → lint/build.gradle
@@ -12,5 +12,10 @@ android {
 }
 
 dependencies {
-    lintPublish project(':qmuilintrule')
+    lintPublish project(':lintrule')
+}
+
+File deployConfig = rootProject.file('gradle/deploy.properties')
+if (deployConfig.exists()) {
+    apply from: rootProject.file('gradle/deploy.gradle')
 }
diff --git a/lint/src/main/AndroidManifest.xml b/lint/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest
+    package="com.qmuiteam.qmui.lint">
+</manifest>
diff --git a/qmuilintrule/.gitignore → lintrule/.gitignore b/qmuilintrule/.gitignore → lintrule/.gitignore
diff --git a/qmuilintrule/build.gradle → lintrule/build.gradle b/qmuilintrule/build.gradle → lintrule/build.gradle
diff --git a/...qmuiteam/qmui/lint/QMUIFWordDetector.java → ...qmuiteam/qmui/lint/QMUIFWordDetector.java b/...qmuiteam/qmui/lint/QMUIFWordDetector.java → ...qmuiteam/qmui/lint/QMUIFWordDetector.java
diff --git a/...eam/qmui/lint/QMUIImageScaleDetector.java → ...eam/qmui/lint/QMUIImageScaleDetector.java b/...eam/qmui/lint/QMUIImageScaleDetector.java → ...eam/qmui/lint/QMUIImageScaleDetector.java
diff --git a/...team/qmui/lint/QMUIImageSizeDetector.java → ...team/qmui/lint/QMUIImageSizeDetector.java b/...team/qmui/lint/QMUIImageSizeDetector.java → ...team/qmui/lint/QMUIImageSizeDetector.java
diff --git a/...qmuiteam/qmui/lint/QMUIIssueRegistry.java → ...qmuiteam/qmui/lint/QMUIIssueRegistry.java b/...qmuiteam/qmui/lint/QMUIIssueRegistry.java → ...qmuiteam/qmui/lint/QMUIIssueRegistry.java
diff --git a/.../lint/QMUIJavaVectorDrawableDetector.java → .../lint/QMUIJavaVectorDrawableDetector.java b/.../lint/QMUIJavaVectorDrawableDetector.java → .../lint/QMUIJavaVectorDrawableDetector.java
diff --git a/...i/lint/QMUIXmlVectorDrawableDetector.java → ...i/lint/QMUIXmlVectorDrawableDetector.java b/...i/lint/QMUIXmlVectorDrawableDetector.java → ...i/lint/QMUIXmlVectorDrawableDetector.java
diff --git a/qmui/build.gradle b/qmui/build.gradle
@@ -50,13 +50,13 @@ dependencies {
     api "com.android.support:appcompat-v7:$supportVersion"
     api "com.android.support:design:$supportVersion"
     api "com.android.support:support-vector-drawable:$supportVersion" // need Gradle Plugin v1.5.0 or above
-    lintChecks project(':qmuilintrule')
+    lintChecks project(':lintrule')
     //test
     testImplementation 'junit:junit:4.12'
 }
 
 // deploy
-//File deployConfig = rootProject.file('gradle/deploy.properties')
-//if (deployConfig.exists()) {
-//    apply from: rootProject.file('gradle/deploy.gradle')
-//}
+File deployConfig = rootProject.file('gradle/deploy.properties')
+if (deployConfig.exists()) {
+    apply from: rootProject.file('gradle/deploy.gradle')
+}
diff --git a/qmuidemo/build.gradle b/qmuidemo/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation project(':lib')
-    api project(':qmuilint')
+    api project(':lint')
     implementation project(':qmui')
     implementation project(':arch')
     annotationProcessor project(':compiler')

diff --git a/qmuilint/src/main/AndroidManifest.xml b/qmuilint/src/main/AndroidManifest.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':qmuidemo', ':qmui', ':lib', ':compiler', ':qmuilint', ':qmuilintrule', ':arch', ':arch-compiler', ':arch-annotation'
+include ':qmuidemo', ':qmui', ':lib', ':compiler', ':lint', ':lintrule', ':arch', ':arch-compiler', ':arch-annotation'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':qmuidemo', ':qmui', ':lib', ':compiler', ':qmuilint', ':qmuilintrule', ':arch', ':arch-compiler', ':arch-annotation'
		include ':qmuidemo', ':qmui', ':lib', ':compiler', ':lint', ':lintrule', ':arch', ':arch-compiler', ':arch-annotation'