Merge remote-tracking branch 'origin/master'

xiazunyang · Oct 30, 2019 · 929b105 · 929b105
2 parents 646fed9 + 6c8ba36
commit 929b105
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 30 deletions.
diff --git a/adapter/build.gradle b/adapter/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 group = 'com.github.xiazunyang'
-version = '1.0'
+version = '0.1.0'
 
 android {
     compileSdkVersion 29

diff --git a/app/build.gradle b/app/build.gradle
@@ -57,7 +57,6 @@ dependencies {
 
     api project(':http')
     api project(':brick')
-    api project(':common')
     api project(':adapter')
     api project(':starter')
     api project(':delegate')
@@ -70,28 +69,4 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
-
-
-//下面的jarPackage和afterEvaluate负责让这个aar再生成一个输出jar包的任务
-def jarPackage(buildType) {
-    return tasks.create("jar${buildType.capitalize()}Package", Copy) {
-        def aarFile = file(project.buildDir.path + "/outputs/aar/${project.name}-${buildType}.aar")
-        def outputDir = file("../plugins/wandroid-lib/libs")
-        from zipTree(aarFile)
-        into outputDir
-        include 'classes.jar'
-        rename 'classes.jar', "${project.name}-${buildType}.jar"
-        group = 'build'
-        description = '生成jar包'
-    }.dependsOn(project.getTasksByName("assemble${buildType.capitalize()}", false).first())
-}
-
-afterEvaluate {
-    android {
-        buildTypes.findAll().each { buildType ->
-            def buildTypeName = buildType.getName()
-            jarPackage(buildTypeName)
-        }
-    }
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.xiazunyang'
-version = '1.0'
+version = '0.1.0'
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:1.3.50"

diff --git a/http/build.gradle b/http/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.xiazunyang'
-version = '1.0'
+version = '0.1.0'
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:1.3.50"

diff --git a/result/build.gradle b/result/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.xiazunyang'
-version = '1.0'
+version = '0.1.0'
 
 android {
     compileSdkVersion 29

diff --git a/rx/build.gradle b/rx/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.xiazunyang'
-version = '1.0'
+version = '0.1.0'
 
 android {
     compileSdkVersion 29