Skip to content

Commit 99ed9d6

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
update part API
1 parent 1cf0dca commit 99ed9d6

File tree

11 files changed

+201
-346
lines changed

11 files changed

+201
-346
lines changed

‎android/src/io/jchat/android/JMessageReactPackage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
1818
return result;
1919
}
2020

21-
@Override
2221
public List<Class<? extends JavaScriptModule>> createJSModules() {
2322
return Collections.emptyList();
2423
}

‎example/android/app/app.iml‎

Lines changed: 49 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -20,7 +19,7 @@
2019
</configuration>
2120
</facet>
2221
</component>
23-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
22+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2423
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2524
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2625
<exclude-output />
@@ -44,118 +43,84 @@
4443
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5351
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5452
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5653
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5754
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5855
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
5956
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
6057
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
6158
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6359
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6460
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7361
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7462
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7563
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7664
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7765
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7966
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8067
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8275
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fbui.textlayoutbuilder/textlayoutbuilder/1.0.0/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.11.0/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.11.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.11.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.41.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9877
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10178
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
10380
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10481
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
10783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
10985
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
11186
</content>
112-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
87+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
11388
<orderEntry type="sourceFolder" forTests="false" />
114-
<orderEntry type="library" exported="" name="okio-1.9.0" level="project" />
115-
<orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
116-
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
117-
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
118-
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
119-
<orderEntry type="library" exported="" name="textlayoutbuilder-1.0.0" level="project" />
120-
<orderEntry type="library" exported="" name="fresco-0.11.0" level="project" />
121-
<orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
122-
<orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
123-
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
124-
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
125-
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
126-
<orderEntry type="library" exported="" name="okhttp-urlconnection-3.4.1" level="project" />
127-
<orderEntry type="library" exported="" name="okhttp-ws-3.4.1" level="project" />
128-
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
129-
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
130-
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
131-
<orderEntry type="library" exported="" name="staticlayout-proxy-1.0" level="project" />
132-
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
133-
<orderEntry type="library" exported="" name="react-native-0.41.0" level="project" />
134-
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
135-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
136-
<orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
137-
<orderEntry type="module" module-name="react-native-dialog" exported="" />
138-
<orderEntry type="module" module-name="react-native-svg" exported="" />
139-
<orderEntry type="module" module-name="jmessage-react-plugin" exported="" />
140-
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
141-
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
142-
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
143-
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
144-
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
145-
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
146-
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
147-
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
148-
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
149-
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
150-
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
151-
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
152-
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
153-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
154-
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
155-
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
156-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
157-
<orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
158-
<orderEntry type="library" exported="" name="jmessage-android-2.1.0" level="project" />
159-
<orderEntry type="library" exported="" name="jcore-android_v1.1.0" level="project" />
89+
<orderEntry type="library" name="okio-1.9.0" level="project" />
90+
<orderEntry type="library" name="drawee-0.11.0" level="project" />
91+
<orderEntry type="library" name="textlayoutbuilder-1.0.0" level="project" />
92+
<orderEntry type="library" name="fresco-0.11.0" level="project" />
93+
<orderEntry type="library" name="gson-2.6.2" level="project" />
94+
<orderEntry type="library" name="jsr305-3.0.0" level="project" />
95+
<orderEntry type="library" name="jmessage-android-2.1.0" level="project" />
96+
<orderEntry type="library" name="bolts-tasks-1.4.0" level="project" />
97+
<orderEntry type="library" name="support-core-ui-25.3.1" level="project" />
98+
<orderEntry type="library" name="okhttp-urlconnection-3.4.1" level="project" />
99+
<orderEntry type="library" name="android-jsc-r174650" level="project" />
100+
<orderEntry type="library" name="staticlayout-proxy-1.0" level="project" />
101+
<orderEntry type="library" name="recyclerview-v7-23.4.0" level="project" />
102+
<orderEntry type="library" name="support-core-utils-25.3.1" level="project" />
103+
<orderEntry type="library" name="fbcore-0.11.0" level="project" />
104+
<orderEntry type="library" name="support-fragment-25.3.1" level="project" />
105+
<orderEntry type="library" name="imagepipeline-0.11.0" level="project" />
106+
<orderEntry type="library" name="library-2.4.0" level="project" />
107+
<orderEntry type="library" name="jcore-android_v1.1.0" level="project" />
108+
<orderEntry type="library" name="imagepipeline-base-0.11.0" level="project" />
109+
<orderEntry type="library" name="soloader-0.1.0" level="project" />
110+
<orderEntry type="library" name="javax.inject-1" level="project" />
111+
<orderEntry type="library" name="okhttp-ws-3.4.1" level="project" />
112+
<orderEntry type="library" name="support-v4-25.3.1" level="project" />
113+
<orderEntry type="library" name="support-media-compat-25.3.1" level="project" />
114+
<orderEntry type="library" name="okhttp-3.4.1" level="project" />
115+
<orderEntry type="library" name="imagepipeline-okhttp3-0.11.0" level="project" />
116+
<orderEntry type="library" name="react-native-0.41.0" level="project" />
117+
<orderEntry type="library" name="support-annotations-25.3.1" level="project" />
118+
<orderEntry type="library" name="appcompat-v7-25.3.1" level="project" />
119+
<orderEntry type="library" name="support-vector-drawable-25.3.1" level="project" />
120+
<orderEntry type="library" name="animated-vector-drawable-25.3.1" level="project" />
121+
<orderEntry type="library" name="support-compat-25.3.1" level="project" />
122+
<orderEntry type="module" module-name="react-native-dialog" />
123+
<orderEntry type="module" module-name="react-native-svg" />
124+
<orderEntry type="module" module-name="jmessage-react-plugin" />
160125
</component>
161126
</module>

‎example/android/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ import com.android.build.OutputFile
6666
* ]
6767
*/
6868

69-
apply from: "react.gradle"
69+
apply from: "../../node_modules/react-native/react.gradle"
7070

7171
/**
7272
* Set this to true to create two separate APKs instead of one:
@@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false
8484
def enableProguardInReleaseBuilds = false
8585

8686
android {
87-
compileSdkVersion 23
88-
buildToolsVersion "23.0.2"
87+
compileSdkVersion 25
88+
buildToolsVersion "25.0.2"
8989

9090
defaultConfig {
9191
applicationId "com.sample.applicaiton"
@@ -146,7 +146,7 @@ dependencies {
146146
compile project(':react-native-dialog')
147147
compile project(':jmessage-react-plugin')
148148
compile fileTree(dir: "libs", include: ["*.jar"])
149-
compile "com.android.support:appcompat-v7:23.0.1"
149+
compile "com.android.support:appcompat-v7:25.3.1"
150150
compile "com.facebook.react:react-native:+" // From node_modules
151151
}
152152

0 commit comments

Comments
 (0)