refector publish script

Tencent · Jul 17, 2019 · cc25e96 · cc25e96
1 parent a457963
commit cc25e96
Show file tree

Hide file tree

Showing 29 changed files with 297 additions and 568 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 /build
 /local.properties
 /captures
+/gradle/deploy.properties
diff --git a/arch-annotation/build.gradle b/arch-annotation/build.gradle
@@ -1,8 +1,16 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
+
+version = QMUI_ARCH_VERSION
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
+
+// deploy
+File deployConfig = rootProject.file('gradle/deploy.properties')
+if (deployConfig.exists()) {
+    apply from: rootProject.file('gradle/deploy.gradle')
+}
diff --git a/arch-compiler/build.gradle b/arch-compiler/build.gradle
@@ -1,11 +1,20 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
+
+version = QMUI_ARCH_VERSION
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':arch-annotation')
-    compile 'com.squareup:javapoet:1.10.0'
-    compile 'com.google.auto.service:auto-service:1.0-rc2'
+    implementation project(':arch-annotation')
+    implementation 'com.squareup:javapoet:1.10.0'
+    implementation 'com.google.auto.service:auto-service:1.0-rc2'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc2'
 }
 
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
+
+// deploy
+File deployConfig = rootProject.file('gradle/deploy.properties')
+if (deployConfig.exists()) {
+    apply from: rootProject.file('gradle/deploy.gradle')
+}
diff --git a/arch/build.gradle b/arch/build.gradle
@@ -1,12 +1,10 @@
 apply plugin: 'com.android.library'
 
-group = 'com.qmuiteam'
-version = "0.3.1"
+version = QMUI_ARCH_VERSION
 
 android {
 
     compileSdkVersion parent.ext.compileSdkVersion
-    buildToolsVersion parent.ext.buildToolsVersion
     lintOptions {
         abortOnError false
     }
@@ -26,15 +24,15 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:$appcompatVersion"
-    implementation "androidx.fragment:fragment:1.1.0-beta01"
+    api "androidx.appcompat:appcompat:$appcompatVersion"
+    api "androidx.fragment:fragment:1.1.0-beta01"
     api project(':arch-annotation')
     compileOnly project(':qmui')
+    testImplementation 'junit:junit:4.12'
 }
 
 // deploy
-File deployConfig = project.file('deploy.properties')
+File deployConfig = rootProject.file('gradle/deploy.properties')
 if (deployConfig.exists()) {
-    apply from: "deployMaven.gradle"
-    apply from: "deployBintray.gradle"
+    apply from: rootProject.file('gradle/deploy.gradle')
 }
diff --git a/arch/deployBintray.gradle b/arch/deployBintray.gradle
diff --git a/arch/deployMaven.gradle b/arch/deployMaven.gradle
diff --git a/arch/project.properties b/arch/project.properties
diff --git a/arch/src/main/AndroidManifest.xml b/arch/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest package="com.qmuiteam.qmui.arch"
-          xmlns:android="http://schemas.android.com/apk/res/android"/>
+<manifest package="com.qmuiteam.qmui.arch"/>
diff --git a/build.gradle b/build.gradle
@@ -6,12 +6,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
+subprojects { project ->
+    group = GROUP
+}
+
 allprojects {
     repositories {
         jcenter()

diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -1,10 +1,11 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':lib')
-    compile 'com.squareup:javapoet:1.10.0'
-    compile 'com.google.auto.service:auto-service:1.0-rc2'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':lib')
+    implementation 'com.squareup:javapoet:1.10.0'
+    implementation 'com.google.auto.service:auto-service:1.0-rc2'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc2'
 }
 
 sourceCompatibility = "1.7"

diff --git a/gradle.properties b/gradle.properties
@@ -19,4 +19,12 @@ org.gradle.jvmargs=-Xmx1536m
 
 android.injected.testOnly=false
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+
+GROUP=com.qmuiteam
+QMUI_VERSION=1.4.0
+QMUI_ARCH_VERSION=0.6.0
+QMUI_LINT_VERSION = 1.1.0
+
+POM_GIT_URL=https://github.com/Tencent/QMUI_Android/
+POM_SITE_URL=https://qmuiteam.com/android