全部升级到1.2.1版本

pengyuantao · Oct 26, 2017 · 808c889 · 808c889
1 parent 31a70ce
commit 808c889
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 39 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,10 +20,10 @@ android {
     versionName "1.0"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-    manifestPlaceholders = [PACKAGE_NAME    : applicationId,
-                            GETUI_APP_ID    : "biFrGOdkOq58YE55rdMPz2",
-                            GETUI_APP_KEY   : "C3vnzVMWB29o2mDJPDKdQ4",
-                            GETUI_APP_SECRET: "gz3fTngzFEAfyMEoZTJCOA"]
+//    manifestPlaceholders = [PACKAGE_NAME    : applicationId,
+//                            GETUI_APP_ID    : "biFrGOdkOq58YE55rdMPz2",
+//                            GETUI_APP_KEY   : "C3vnzVMWB29o2mDJPDKdQ4",
+//                            GETUI_APP_SECRET: "gz3fTngzFEAfyMEoZTJCOA"]
 
     ndk {
       // 设置支持的SO库
@@ -76,24 +76,28 @@ dependencies {
   annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:2.4.0'
   compile 'com.android.support:appcompat-v7:25.3.1'
   compile 'com.android.support.constraint:constraint-layout:1.0.2'
-//  compile 'com.peng.library:one-push-core:1.0.4'
-//  compile 'com.peng.library:one-push-getui:1.0.2'
-//  compile 'com.peng.library:one-push-huawei:1.0.2'
-//  compile 'com.peng.library:one-push-xiaomi:1.0.3'
-//  compile 'com.peng.library:one-push-meizu:1.0.1'
-//  compile('com.peng.library:one-push-umeng:1.0.5') {
-//    //如果你使用了其他工程的utdid4all的jar，导致和OnePush冲突的话，请把下面加上
-//    //exclude group: 'com.peng.library', module: 'one-push-umeng-utdid4all'
-//  }
-      compile project(':one-push-umeng')
-//      compile project(':one-push-huawei')
-      compile project(':one-push-huawei-hms')
-      compile project(':one-push-xiaomi')
-      compile project(':one-push-umeng-utdid4all')
-      compile project(':one-push-core')
-      compile project(':one-push-getui')
-      compile project(':one-push-meizu')
-      compile project(':one-push-jpush')
+  compile 'com.peng.library:one-push-core:1.2.1'
+  compile 'com.peng.library:one-push-getui:1.2.1'
+//  compile 'com.peng.library:one-push-huawei:1.2.1'
+  compile 'com.peng.library:one-push-huawei-hms:1.2.1'
+  compile 'com.peng.library:one-push-xiaomi:1.2.1'
+  compile 'com.peng.library:one-push-meizu:1.2.1'
+  compile 'com.peng.library:one-push-jpush:1.2.1'
+  compile('com.peng.library:one-push-umeng:1.2.1') {
+    //如果你使用了其他工程的utdid4all的jar，导致和OnePush冲突的话，请把下面加上
+    //exclude group: 'com.peng.library', module: 'one-push-umeng-utdid4all'
+  }
+
+
+//      compile project(':one-push-umeng')
+////      compile project(':one-push-huawei')
+//      compile project(':one-push-huawei-hms')
+//      compile project(':one-push-xiaomi')
+//      compile project(':one-push-umeng-utdid4all')
+//      compile project(':one-push-core')
+//      compile project(':one-push-getui')
+//      compile project(':one-push-meizu')
+//      compile project(':one-push-jpush')
 }
 
 /* 别名: onepush

diff --git a/app/src/main/java/com/peng/one/push1/PushApplication.java b/app/src/main/java/com/peng/one/push1/PushApplication.java
@@ -39,7 +39,7 @@ public void onCreate() {
                 //}
                 //Log.i(TAG, "Register-> code: "+platformCode+" name: "+platformName+" result: "+result);
                 //return result;
-                return platformCode == 107;
+                return platformCode == 106;
             }));
             OnePush.register();
         }

diff --git a/one-push-core/build.gradle b/one-push-core/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0.4"
+        versionName "1.2.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/one-push-getui/build.gradle b/one-push-getui/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0.2"
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -37,7 +37,7 @@ dependencies {
     compile 'com.android.support:support-v4:25.3.1'
     testCompile 'junit:junit:4.12'
 //    provided project(':one-push-core')
-    provided 'com.peng.library:one-push-core:1.0.3'
+    provided 'com.peng.library:one-push-core:1.2.1'
 }
 
 apply plugin: 'com.novoda.bintray-release'

diff --git a/one-push-huawei-hms/build.gradle b/one-push-huawei-hms/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.2.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -29,5 +29,27 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
     compile 'com.huawei.android.hms:push:2.5.2.300'
-    provided 'com.peng.library:one-push-core:1.0.3'
+    provided 'com.peng.library:one-push-core:1.2.1'
 }
+
+
+apply plugin: 'com.novoda.bintray-release'
+//设置所有工程编码为UTF-8编码，防止出现编码GBK的不可映射字符
+allprojects {
+    tasks.withType(Javadoc) {
+        options {
+            encoding "UTF-8"
+            charSet 'UTF-8'
+            links "http://docs.oracle.com/javase/7/docs/api"
+        }
+    }
+}
+
+publish {
+    userOrg = 'pengyuantao'
+    groupId = 'com.peng.library'
+    artifactId = 'one-push-huawei-hms'
+    publishVersion = android.defaultConfig.versionName
+    desc = 'Oh hi, this is a nice description for a project, right?'
+    website = 'https://github.com/novoda/bintray-release'
+}
diff --git a/one-push-huawei/build.gradle b/one-push-huawei/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0.2"
+        versionName "1.2.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -33,8 +33,8 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-//    provided 'com.peng.library:one-push-core:1.0.3'
-    compile project(':one-push-core')
+    provided 'com.peng.library:one-push-core:1.2.1'
+//    compile project(':one-push-core')
 }
 
 apply plugin: 'com.novoda.bintray-release'

diff --git a/one-push-jpush/build.gradle b/one-push-jpush/build.gradle
@@ -8,7 +8,7 @@ android {
     minSdkVersion 14
     targetSdkVersion 25
     versionCode 1
-    versionName "1.0"
+    versionName "1.2.1"
 
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
@@ -33,5 +33,27 @@ dependencies {
   })
   compile 'com.android.support:appcompat-v7:25.3.1'
   testCompile 'junit:junit:4.12'
-  provided project(':one-push-core')
+  provided 'com.peng.library:one-push-core:1.2.1'
+//  provided project(':one-push-core')
 }
+
+apply plugin: 'com.novoda.bintray-release'
+//设置所有工程编码为UTF-8编码，防止出现编码GBK的不可映射字符
+allprojects {
+  tasks.withType(Javadoc) {
+    options {
+      encoding "UTF-8"
+      charSet 'UTF-8'
+      links "http://docs.oracle.com/javase/7/docs/api"
+    }
+  }
+}
+
+publish {
+  userOrg = 'pengyuantao'
+  groupId = 'com.peng.library'
+  artifactId = 'one-push-jpush'
+  publishVersion = android.defaultConfig.versionName
+  desc = 'Oh hi, this is a nice description for a project, right?'
+  website = 'https://github.com/novoda/bintray-release'
+}
diff --git a/one-push-meizu/build.gradle b/one-push-meizu/build.gradle
@@ -8,7 +8,7 @@ android {
     minSdkVersion 14
     targetSdkVersion 25
     versionCode 1
-    versionName "1.0.1"
+    versionName "1.2.1"
 
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
@@ -28,7 +28,7 @@ dependencies {
   compile 'com.android.support:appcompat-v7:25.3.1'
   compile 'com.meizu.flyme.internet:push-internal:3.4.2@aar'
   //    provided project(':one-push-core')
-  provided 'com.peng.library:one-push-core:1.0.3'
+  provided 'com.peng.library:one-push-core:1.2.1'
   testCompile 'junit:junit:4.12'
 }
 

diff --git a/one-push-umeng/build.gradle b/one-push-umeng/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0.5"
+        versionName "1.2.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -36,7 +36,7 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
-    provided 'com.peng.library:one-push-core:1.0.3'
+    provided 'com.peng.library:one-push-core:1.2.1'
 //    compile project(':one-push-core')
     compile 'com.peng.library:one-push-umeng-utdid4all:1.0.1'
 }

diff --git a/one-push-xiaomi/build.gradle b/one-push-xiaomi/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0.3"
+        versionName "1.2.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -32,7 +32,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testCompile 'junit:junit:4.12'
-    provided 'com.peng.library:one-push-core:1.0.3'
+    provided 'com.peng.library:one-push-core:1.2.1'
 //    compile project(':one-push-core')
 }