gradle版本修改

memorise · Oct 1, 2016 · 03b4cdb · 03b4cdb
1 parent ee7081e
commit 03b4cdb
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.lzy.demo"
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 23
-        versionName "1.8.1"
+        versionCode 20
+        versionName "2.0.0"
     }
     signingConfigs {
         appkey {

diff --git a/app/src/main/res/mipmap-xhdpi/logo.jpg b/app/src/main/res/mipmap-xhdpi/logo.jpg
diff --git a/app/src/main/res/mipmap-xhdpi/logo.png b/app/src/main/res/mipmap-xhdpi/logo.png
diff --git a/okgo/bintray.gradle b/okgo/bintray.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.8.1"              // 数据仓库依赖第三部分
+version = "2.0.0"              // 数据仓库依赖第三部分
 
-def siteUrl = 'https://github.com/jeasonlzy0216/OkGo'
-def gitUrl = 'https://github.com/jeasonlzy0216/OkGo.git'
+def siteUrl = 'https://github.com/jeasonlzy/OkGo'
+def gitUrl = 'https://github.com/jeasonlzy/OkGo.git'
 group = "com.lzy.net"       // 数据仓库依赖第一部分
 
 install {

diff --git a/okgo/build.gradle b/okgo/build.gradle
@@ -5,10 +5,10 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
-        versionCode 17
-        versionName "1.8.1"
+        minSdkVersion 9
+        targetSdkVersion 24
+        versionCode 20
+        versionName "2.0.0"
     }
 }
 
@@ -18,4 +18,4 @@ dependencies {
     compile 'com.squareup.okhttp3:okhttp:3.4.1'
 }
 
-//apply from: 'bintray.gradle'
+//apply from: 'bintray.gradle'、
diff --git a/okrx/bintray.gradle b/okrx/bintray.gradle
@@ -0,0 +1,93 @@
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+version = "0.1.0"              // 数据仓库依赖第三部分
+
+def siteUrl = 'https://github.com/jeasonlzy/OkGo'
+def gitUrl = 'https://github.com/jeasonlzy/OkGo.git'
+group = "com.lzy.net"       // 数据仓库依赖第一部分
+
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+                name 'OkRx For Android'     // 项目描述
+                url siteUrl
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'jeasonlzy'                // 开发者信息
+                        name 'LiaoZiYao'              // 开发者信息
+                        email '[email protected]'    // 开发者信息
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+javadoc {
+    options {
+        encoding "UTF-8"
+        charSet 'UTF-8'
+        author true
+        version true
+        links "http://docs.oracle.com/javase/7/docs/api"
+        title 'OkRx For Android'   // 文档标题
+    }
+}
+
+artifacts {
+//    archives javadocJar
+    archives sourcesJar
+}
+
+// 生成jar包
+task releaseJar(type: Copy) {
+    from( 'build/intermediates/bundles/release')
+    into( '../jar')
+    include('classes.jar')
+    rename('classes.jar', 'okrx-' + version + '.jar')
+}
+
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+bintray {
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+    configurations = ['archives']
+    pkg {
+        repo = "maven"
+        name = "okrx"             // 数据仓库依赖第二部分
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ["Apache-2.0"]
+        publish = true
+    }
+}
diff --git a/okrx/build.gradle b/okrx/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 9
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'io.reactivex:rxjava:1.1.10'
+    compile 'io.reactivex:rxjava:1.2.0'
     compile 'io.reactivex:rxandroid:1.2.1'
     compile project(':okgo')
 }
diff --git a/okserver/bintray.gradle b/okserver/bintray.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.0.3"              // 数据仓库依赖第三部分
+version = "1.1.0"              // 数据仓库依赖第三部分
 
-def siteUrl = 'https://github.com/jeasonlzy0216/OkGo'
-def gitUrl = 'https://github.com/jeasonlzy0216/OkGo.git'
+def siteUrl = 'https://github.com/jeasonlzy/OkGo'
+def gitUrl = 'https://github.com/jeasonlzy/OkGo.git'
 group = "com.lzy.net"       // 数据仓库依赖第一部分
 
 install {

diff --git a/okserver/build.gradle b/okserver/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 24
         versionCode 13
         versionName "1.0.3"