Skip to content

Commit 87cec49

Browse files
JoshLipanJoshLipan
committed
Update example
1 parent 974a9a5 commit 87cec49

File tree

12 files changed

+8665
-39
lines changed

12 files changed

+8665
-39
lines changed

‎example/android/.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>TestReactJChat</name>
4+
<comment>Project TestReactJChat created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

‎example/android/.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

‎example/android/app/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin"/>
6+
</classpath>

‎example/android/app/.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>app</name>
4+
<comment>Project app created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>

‎example/android/app/.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Tue May 22 13:17:58 CST 2018
2+
connection.project.dir=..

‎example/android/app/app.iml‎

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -84,59 +84,40 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
9787
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9889
</content>
99-
<orderEntry type="jdk" jdkName="Android API 25 Platform (2)" jdkType="Android SDK" />
90+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
10091
<orderEntry type="sourceFolder" forTests="false" />
10192
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-okhttp3-1.3.0" level="project" />
10293
<orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
10394
<orderEntry type="library" name="com.google.android:flexbox-0.2.5" level="project" />
95+
<orderEntry type="library" name="com.github.bumptech.glide:disklrucache:4.6.1@jar" level="project" />
96+
<orderEntry type="library" name="cn.jiguang.imui:chatinput-0.8.3" level="project" />
10497
<orderEntry type="library" name="javax.inject:javax.inject:1@jar" level="project" />
105-
<orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
106-
<orderEntry type="library" name="cn.jiguang.imui:chatinput-0.6.3" level="project" />
107-
<orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
10898
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.3.0" level="project" />
109-
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-android_v2.4.1.jar:unspecified@jar" level="project" />
11099
<orderEntry type="library" name="com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
111100
<orderEntry type="library" name="com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
112101
<orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.6.0@jar" level="project" />
113-
<orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.8" level="project" />
114102
<orderEntry type="library" name="com.facebook.soloader:soloader-0.1.0" level="project" />
115-
<orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
103+
<orderEntry type="library" name="com.github.bumptech.glide:glide-4.6.1" level="project" />
116104
<orderEntry type="library" name="com.squareup.okio:okio:1.13.0@jar" level="project" />
117-
<orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
118-
<orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
105+
<orderEntry type="library" name="cn.jiguang.imui:messagelist-0.7.4" level="project" />
119106
<orderEntry type="library" name="com.facebook.fresco:fresco-1.3.0" level="project" />
120-
<orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
121107
<orderEntry type="library" name="com.facebook.fresco:imagepipeline-1.3.0" level="project" />
122-
<orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
123108
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.6.0@jar" level="project" />
124109
<orderEntry type="library" name="com.facebook.fresco:fbcore-1.3.0" level="project" />
125-
<orderEntry type="library" name="com.android.support:transition-25.3.1" level="project" />
126-
<orderEntry type="library" name="com.android.support:design-25.3.1" level="project" />
127110
<orderEntry type="library" name="com.facebook.fresco:drawee-1.3.0" level="project" />
128-
<orderEntry type="library" name="com.facebook.react:react-native-0.51.0" level="project" />
111+
<orderEntry type="library" name="com.github.bumptech.glide:annotations:4.6.1@jar" level="project" />
112+
<orderEntry type="library" name="com.facebook.react:react-native-0.51.1" level="project" />
129113
<orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
130-
<orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
131-
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.1.8.jar:unspecified@jar" level="project" />
132-
<orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-android_v2.5.0.jar:unspecified@jar" level="project" />
114+
<orderEntry type="library" name="__local_aars__:/Users/josh/Desktop/workspace/Jiguang/JMessage/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-sdk-android-2.7.0.jar:unspecified@jar" level="project" />
115+
<orderEntry type="library" name="com.github.bumptech.glide:gifdecoder-4.6.1" level="project" />
133116
<orderEntry type="library" name="org.greenrobot:eventbus:3.0.0@jar" level="project" />
134-
<orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
135117
<orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:textlayoutbuilder-1.0.0" level="project" />
136-
<orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
137-
<orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
118+
<orderEntry type="library" name="__local_aars__:/Users/josh/Desktop/workspace/Jiguang/JMessage/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.2.3.jar:unspecified@jar" level="project" />
138119
<orderEntry type="library" name="org.webkit:android-jsc-r174650" level="project" />
139-
<orderEntry type="library" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
120+
<orderEntry type="library" name="pub.devrel:easypermissions-1.0.1" level="project" />
140121
<orderEntry type="module" module-name="jcore-react-native" />
141122
<orderEntry type="module" module-name="react-native-fs" />
142123
<orderEntry type="module" module-name="aurora-imui-react-native" />

‎example/android/app/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def enableSeparateBuildPerCPUArchitecture = false
8585
def enableProguardInReleaseBuilds = false
8686

8787
android {
88-
compileSdkVersion 25
89-
buildToolsVersion "26.0.2"
88+
compileSdkVersion 27
89+
buildToolsVersion "27.0.3"
9090

9191
defaultConfig {
9292
applicationId "com.sample.applicaiton"
@@ -136,9 +136,10 @@ dependencies {
136136
compile project(':jmessage-react-plugin')
137137
compile project(':jcore-react-native')
138138
compile project(':aurora-imui-react-native')
139-
compile fileTree(dir: "libs", include: ["*.jar"])
140-
compile "com.android.support:appcompat-v7:25.3.1"
141-
compile "com.facebook.react:react-native:+" // From node_modules
139+
compile fileTree(include: ['*.jar'], dir: 'libs')
140+
implementation 'com.android.support:appcompat-v7:27.1.0'
141+
compile 'com.facebook.react:react-native:+'
142+
// From node_modules
142143
}
143144

144145
// Run this once to be able to run the application with BUCK

‎example/android/app/src/main/java/com/sample/application/MainApplication.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import android.util.Log;
55

66
import com.facebook.react.ReactApplication;
7+
import com.rnfs.RNFSPackage;
8+
import io.jchat.android.JMessageReactPackage;
79

810
import cn.jiguang.imui.messagelist.ReactIMUIPackage;
911
import cn.jpush.im.android.api.JMessageClient;

‎example/android/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ buildscript {
1212
maven {
1313
url 'https://dl.google.com/dl/android/maven2/'
1414
}
15+
google()
1516
}
1617
dependencies {
1718
classpath 'com.android.tools.build:gradle:3.0.1'
@@ -29,5 +30,6 @@ allprojects {
2930
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
3031
url "$rootDir/../node_modules/react-native/android"
3132
}
33+
google()
3234
}
3335
}

‎example/android/settings.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ include ':react-native-fs'
33
project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
44
include ':jmessage-react-plugin'
55
project(':jmessage-react-plugin').projectDir = new File(rootProject.projectDir, '../node_modules/jmessage-react-plugin/android')
6+
include ':react-native-fs'
7+
project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
8+
include ':jmessage-react-plugin'
9+
project(':jmessage-react-plugin').projectDir = new File(rootProject.projectDir, '../node_modules/jmessage-react-plugin/android')
610
include ':jcore-react-native'
711
project(':jcore-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/jcore-react-native/android')
812
include ':app', ':aurora-imui-react-native'

0 commit comments

Comments
 (0)