Merge pull request #156 from jinfengf/master

JChat 2.3.0
jpush · May 28, 2019 · 64486d2 · 64486d2
2 parents 3ab3c92 + cc60d8f
commit 64486d2
Show file tree

Hide file tree

Showing 264 changed files with 8,932 additions and 2,383 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,6 +21,7 @@ allprojects {
             url "https://oss.sonatype.org/content/repositories/snapshots/"
         }
         maven { url "https://jitpack.io" }
+        google()
     }
 }
 

diff --git a/chatapp/ChangeLog.md b/chatapp/ChangeLog.md
@@ -0,0 +1,10 @@
+### JChat v2.3.0
+
+#### ChangeLog
+
+##### BugFix:
++ 修复表情库无法使用问题
++ 修复用户反馈的一些其他bug
+
+##### NewFeature
++ 新增聊天室功能
diff --git a/chatapp/build.gradle b/chatapp/build.gradle
@@ -1,17 +1,16 @@
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 26
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "io.jchat.android"
         minSdkVersion 18
         targetSdkVersion 23
         versionCode 61
-        versionName "2.2.0"
+        versionName "2.3.0"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
         manifestPlaceholders = [
                 JPUSH_PKGNAME : applicationId,
                 JPUSH_APPKEY : "4f7aef34fb361292c566a1cd", //JPush上注册的包名对应的appkey.
@@ -20,9 +19,8 @@ android {
 
         ndk {
             //选择要添加的对应cpu类型的.so库。
-            abiFilters 'armeabi', 'armeabi-v7a', 'armeabi-v8a','x86', 'x86_64', 'mips', 'mips64'
+            abiFilters 'armeabi', 'armeabi-v7a', 'armeabi-v8a', 'x86', 'x86_64', 'mips', 'mips64'
         }
-
     }
     buildTypes {
         release {
@@ -38,31 +36,42 @@ android {
     }
     aaptOptions.cruncherEnabled = false
     aaptOptions.useNewCruncher = false
-
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'
+    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.1.0'
-    compile 'com.android.support:design:23.1.0'
-    testCompile 'junit:junit:4.12'
-    compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.github.bumptech.glide:glide:3.6.1'
-    compile 'com.github.w446108264:AndroidEmoji:1.0.0'
-    compile 'com.github.chrisbanes.photoview:library:1.2.4'
-    compile 'com.facebook.fresco:fresco:0.8.1'
-    compile 'org.greenrobot:eventbus:3.0.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile project(':reclib-qq')
-    compile project(':reclib-testemoticons')
-    compile 'com.contrarywind:Android-PickerView:3.2.4'
-    compile 'cn.jiguang.sdk:jmessage:2.7.0'  // 此处以JMessage 2.7.0 版本为例。
-    compile 'cn.jiguang.sdk:jcore:1.2.3'  // 此处以JCore 1.2.3 版本为例。
+    implementation 'com.android.support:multidex:1.0.1'
+    implementation 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.jakewharton:butterknife:7.0.1'
+    annotationProcessor 'com.jakewharton:butterknife:7.0.1'
+    implementation 'com.github.bumptech.glide:glide:3.6.1'
+    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
+    implementation 'com.facebook.fresco:fresco:0.8.1'
+    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation project(':emoji')
+    implementation project(':reclib-qq')
+    implementation project(':reclib-testemoticons')
+    implementation 'com.contrarywind:Android-PickerView:3.2.4'
+    implementation 'com.yanzhenjie:permission:1.1.2'
+    implementation 'cn.jiguang.sdk:jmessage:2.9.0'  // 此处以J
+    implementation 'cn.jiguang.sdk:jcore:2.0.0'
+    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-26'
+    implementation 'com.github.mtotschnig:StickyListHeaders:2.7.1'
 }