diff --git a/arch/build.gradle b/arch/build.gradle index 312bcbd40..66cc564a1 100644 --- 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 b/lint/.gitignore similarity index 100% rename from qmuilint/.gitignore rename to lint/.gitignore diff --git a/qmuilint/build.gradle b/lint/build.gradle similarity index 56% rename from qmuilint/build.gradle rename to lint/build.gradle index d24ffc179..4591665f2 100644 --- a/qmuilint/build.gradle +++ b/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 new file mode 100644 index 000000000..4307d152a --- /dev/null +++ b/lint/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/qmuilintrule/.gitignore b/lintrule/.gitignore similarity index 100% rename from qmuilintrule/.gitignore rename to lintrule/.gitignore diff --git a/qmuilintrule/build.gradle b/lintrule/build.gradle similarity index 100% rename from qmuilintrule/build.gradle rename to lintrule/build.gradle diff --git a/qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIFWordDetector.java b/lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIFWordDetector.java similarity index 100% rename from qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIFWordDetector.java rename to lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIFWordDetector.java diff --git a/qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageScaleDetector.java b/lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageScaleDetector.java similarity index 100% rename from qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageScaleDetector.java rename to lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageScaleDetector.java diff --git a/qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageSizeDetector.java b/lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageSizeDetector.java similarity index 100% rename from qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageSizeDetector.java rename to lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIImageSizeDetector.java diff --git a/qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIIssueRegistry.java b/lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIIssueRegistry.java similarity index 100% rename from qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIIssueRegistry.java rename to lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIIssueRegistry.java diff --git a/qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIJavaVectorDrawableDetector.java b/lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIJavaVectorDrawableDetector.java similarity index 100% rename from qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIJavaVectorDrawableDetector.java rename to lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIJavaVectorDrawableDetector.java diff --git a/qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIXmlVectorDrawableDetector.java b/lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIXmlVectorDrawableDetector.java similarity index 100% rename from qmuilintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIXmlVectorDrawableDetector.java rename to lintrule/src/main/java/com/qmuiteam/qmui/lint/QMUIXmlVectorDrawableDetector.java diff --git a/qmui/build.gradle b/qmui/build.gradle index 3c2d0f934..33d3ee421 100644 --- 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') -//} \ No newline at end of file +File deployConfig = rootProject.file('gradle/deploy.properties') +if (deployConfig.exists()) { + apply from: rootProject.file('gradle/deploy.gradle') +} \ No newline at end of file diff --git a/qmuidemo/build.gradle b/qmuidemo/build.gradle index f23386bde..f4effe673 100644 --- 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 deleted file mode 100644 index 850ab32ff..000000000 --- a/qmuilint/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/settings.gradle b/settings.gradle index 45902c624..e53745389 100644 --- 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'