update gradle.

qingmei2 · Oct 18, 2018 · 95ca83a · 95ca83a
1 parent ae37d66
commit 95ca83a
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 43 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-//        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath 'com.novoda:bintray-release:0.8.1'
     }
 }
 
@@ -32,7 +32,7 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-//tasks.getByPath(":rximagepicker:releaseAndroidJavadocs").enabled = false
-//tasks.getByPath(":rximagepicker_support:releaseAndroidJavadocs").enabled = false
-//tasks.getByPath(":rximagepicker_support_wechat:releaseAndroidJavadocs").enabled = false
-//tasks.getByPath(":rximagepicker_support_zhihu:releaseAndroidJavadocs").enabled = false
+tasks.getByPath(":rximagepicker:releaseAndroidJavadocs").enabled = false
+tasks.getByPath(":rximagepicker_support:releaseAndroidJavadocs").enabled = false
+tasks.getByPath(":rximagepicker_support_wechat:releaseAndroidJavadocs").enabled = false
+tasks.getByPath(":rximagepicker_support_zhihu:releaseAndroidJavadocs").enabled = false
diff --git a/config.gradle b/config.gradle
@@ -10,7 +10,7 @@ project.ext {
             minSdkVersion    : 16,
             targetSdkVersion : 28,
             versionCode      : 21,
-            versionName      : "2.3.0"
+            versionName      : "2.3.0-alpha"
     ]
 
     dependencies = [

diff --git a/rximagepicker/build.gradle b/rximagepicker/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-//apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
@@ -41,11 +41,11 @@ repositories {
     mavenCentral()
 }
 
-//publish {
-//    userOrg = 'mq2553299'
-//    groupId = 'com.github.qingmei2'
-//    artifactId = 'rximagepicker'
-//    publishVersion = rootProject.ext.android["versionName"]
-//    desc = 'The library which choosing pictures from camera or gallery in Android.'
-//    website = 'https://github.com/qingmei2/RxImagePicker'
-//}
+publish {
+    userOrg = 'mq2553299'
+    groupId = 'com.github.qingmei2'
+    artifactId = 'rximagepicker'
+    publishVersion = rootProject.ext.android["versionName"]
+    desc = 'The library which choosing pictures from camera or gallery in Android.'
+    website = 'https://github.com/qingmei2/RxImagePicker'
+}
diff --git a/rximagepicker_support/build.gradle b/rximagepicker_support/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-//apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
@@ -43,11 +43,11 @@ repositories {
     mavenCentral()
 }
 
-//publish {
-//    userOrg = 'mq2553299'
-//    groupId = 'com.github.qingmei2'
-//    artifactId = 'rximagepicker_support'
-//    publishVersion = rootProject.ext.android["versionName"]
-//    desc = 'The library which choosing pictures from camera or gallery in Android.'
-//    website = 'https://github.com/qingmei2/RxImagePicker'
-//}
+publish {
+    userOrg = 'mq2553299'
+    groupId = 'com.github.qingmei2'
+    artifactId = 'rximagepicker_support'
+    publishVersion = rootProject.ext.android["versionName"]
+    desc = 'The library which choosing pictures from camera or gallery in Android.'
+    website = 'https://github.com/qingmei2/RxImagePicker'
+}
diff --git a/rximagepicker_support_wechat/build.gradle b/rximagepicker_support_wechat/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
@@ -51,14 +51,14 @@ dependencies {
 repositories {
     mavenCentral()
 }
-//publish {
-//    userOrg = 'mq2553299'
-//    groupId = 'com.github.qingmei2'
-//    artifactId = 'rximagepicker_support_wechat'
-//    publishVersion = rootProject.ext.android["versionName"]
-//    desc = 'The library which choosing pictures from camera or gallery in Android.'
-//    website = 'https://github.com/qingmei2/RxImagePicker'
-//}
+publish {
+    userOrg = 'mq2553299'
+    groupId = 'com.github.qingmei2'
+    artifactId = 'rximagepicker_support_wechat'
+    publishVersion = rootProject.ext.android["versionName"]
+    desc = 'The library which choosing pictures from camera or gallery in Android.'
+    website = 'https://github.com/qingmei2/RxImagePicker'
+}
 kapt {
     generateStubs = true
 }
diff --git a/rximagepicker_support_zhihu/build.gradle b/rximagepicker_support_zhihu/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-//apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion rootProject.ext.android["compileSdkVersion"]
@@ -52,14 +52,14 @@ dependencies {
 repositories {
     mavenCentral()
 }
-//publish {
-//    userOrg = 'mq2553299'
-//    groupId = 'com.github.qingmei2'
-//    artifactId = 'rximagepicker_support_zhihu'
-//    publishVersion = rootProject.ext.android["versionName"]
-//    desc = 'The library which choosing pictures from camera or gallery in Android.'
-//    website = 'https://github.com/qingmei2/RxImagePicker'
-//}
+publish {
+    userOrg = 'mq2553299'
+    groupId = 'com.github.qingmei2'
+    artifactId = 'rximagepicker_support_zhihu'
+    publishVersion = rootProject.ext.android["versionName"]
+    desc = 'The library which choosing pictures from camera or gallery in Android.'
+    website = 'https://github.com/qingmei2/RxImagePicker'
+}
 kapt {
     generateStubs = true
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -39,7 +39,9 @@ def testJcenter = false
 dependencies {
     implementation rootProject.ext.dependencies["kotlin-android"]
     implementation rootProject.ext.dependencies["appcompat"]
-    implementation rootProject.ext.dependencies["design"]
+    implementation(rootProject.ext.dependencies["design"]) {
+        exclude group: 'androidx.recyclerview'
+    }
     implementation rootProject.ext.dependencies["glide"]
     kapt rootProject.ext.dependencies["glide-compiler"]