Skip to content

Commit 9a4ab77

Browse files
realtime-frameworkrealtime-framework
committed
Merge pull request #5 from Gustash/master
Support for Android API 23 (Android Marshmallow 6.0)
2 parents a2dfc06 + d84c260 commit 9a4ab77

File tree

18 files changed

+147
-60
lines changed

18 files changed

+147
-60
lines changed

‎RTMChat/.idea/compiler.xml‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RTMChat/.idea/encodings.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎RTMChat/.idea/gradle.xml‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RTMChat/.idea/misc.xml‎

Lines changed: 39 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RTMChat/.idea/modules.xml‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RTMChat/.idea/runConfigurations.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RTMChat/.idea/scopes/scope_settings.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎RTMChat/.idea/vcs.xml‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RTMChat/RTMChat.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="RTMChat" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1112
<output url="file://$MODULE_DIR$/build/classes/main" />
1213
<output-test url="file://$MODULE_DIR$/build/classes/test" />
1314
<exclude-output />
@@ -17,5 +18,4 @@
1718
<orderEntry type="inheritedJdk" />
1819
<orderEntry type="sourceFolder" forTests="false" />
1920
</component>
20-
</module>
21-
21+
</module>

‎RTMChat/app/app.iml‎

Lines changed: 72 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="RTMChat" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="RTMChat" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -9,11 +9,15 @@
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_" />
1213
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1314
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
19+
<task>generateDebugSources</task>
20+
</afterSyncTasks>
1721
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1822
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1923
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -22,22 +26,23 @@
2226
</configuration>
2327
</facet>
2428
</component>
25-
<component name="NewModuleRootManager" inherit-compiler-output="false">
29+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2630
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
2732
<exclude-output />
2833
<content url="file://$MODULE_DIR$">
2934
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3035
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3136
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3237
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3338
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4146
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4247
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4348
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -66,6 +71,32 @@
6671
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
6772
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
6873
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/co.realtime/messaging-android/2.1.52/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.2.0/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.8.0/jars" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.8.0/jars" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/7.8.0/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/7.8.0/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appstate/7.8.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.8.0/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/7.8.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/7.8.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/7.8.0/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-games/7.8.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/7.8.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/7.8.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/7.8.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/7.8.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-nearby/7.8.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/7.8.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/7.8.0/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/7.8.0/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/7.8.0/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wallet/7.8.0/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.8.0/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/7.8.0/jars" />
69100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
70101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
71102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -81,14 +112,34 @@
81112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82113
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
83114
</content>
84-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
115+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
85116
<orderEntry type="sourceFolder" forTests="false" />
86-
<orderEntry type="library" exported="" name="messaging-android-2.1.34" level="project" />
87-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
88-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
89-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
90-
<orderEntry type="library" exported="" name="ortc-android-2.1.26" level="project" />
91-
<orderEntry type="library" exported="" name="play-services-6.1.71" level="project" />
117+
<orderEntry type="library" exported="" name="play-services-vision-7.8.0" level="project" />
118+
<orderEntry type="library" exported="" name="play-services-identity-7.8.0" level="project" />
119+
<orderEntry type="library" exported="" name="play-services-drive-7.8.0" level="project" />
120+
<orderEntry type="library" exported="" name="messaging-android-2.1.52" level="project" />
121+
<orderEntry type="library" exported="" name="play-services-location-7.8.0" level="project" />
122+
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
123+
<orderEntry type="library" exported="" name="play-services-nearby-7.8.0" level="project" />
124+
<orderEntry type="library" exported="" name="play-services-ads-7.8.0" level="project" />
125+
<orderEntry type="library" exported="" name="play-services-panorama-7.8.0" level="project" />
126+
<orderEntry type="library" exported="" name="mediarouter-v7-22.2.0" level="project" />
127+
<orderEntry type="library" exported="" name="play-services-safetynet-7.8.0" level="project" />
128+
<orderEntry type="library" exported="" name="play-services-analytics-7.8.0" level="project" />
129+
<orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
130+
<orderEntry type="library" exported="" name="play-services-appinvite-7.8.0" level="project" />
131+
<orderEntry type="library" exported="" name="play-services-plus-7.8.0" level="project" />
132+
<orderEntry type="library" exported="" name="play-services-7.8.0" level="project" />
133+
<orderEntry type="library" exported="" name="play-services-appindexing-7.8.0" level="project" />
134+
<orderEntry type="library" exported="" name="play-services-fitness-7.8.0" level="project" />
135+
<orderEntry type="library" exported="" name="play-services-gcm-7.8.0" level="project" />
136+
<orderEntry type="library" exported="" name="play-services-games-7.8.0" level="project" />
137+
<orderEntry type="library" exported="" name="play-services-cast-7.8.0" level="project" />
138+
<orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
139+
<orderEntry type="library" exported="" name="play-services-appstate-7.8.0" level="project" />
140+
<orderEntry type="library" exported="" name="play-services-wallet-7.8.0" level="project" />
141+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
142+
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
143+
<orderEntry type="library" exported="" name="play-services-maps-7.8.0" level="project" />
92144
</component>
93-
</module>
94-
145+
</module>

0 commit comments

Comments
 (0)