Skip to content

Commit 329ccf2

Browse files
mythzmythz
committed
Update proj files
1 parent 54e366c commit 329ccf2

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

‎src/AndroidClient/android/android.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7070
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -84,6 +76,14 @@
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

‎src/AndroidClient/androidchat/androidchat.iml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
@@ -92,6 +92,8 @@
9292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.5/jars" />
9393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.1/jars" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/25.0.0/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/customtabs/25.0.0/jars" />
9597
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.1.1/jars" />
9698
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.1.1/jars" />
9799
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.1.1/jars" />
@@ -102,6 +104,7 @@
102104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.1/jars" />
103105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.1/jars" />
104106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.1.1/jars" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.android/facebook-android-sdk/4.19.0/jars" />
105108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/tweet-composer/2.3.1/jars" />
106109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/tweet-ui/2.3.1/jars" />
107110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.twitter.sdk.android/twitter-core/2.3.0/jars" />
@@ -130,8 +133,12 @@
130133
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
131134
<orderEntry type="library" exported="" name="design-25.1.1" level="project" />
132135
<orderEntry type="library" exported="" name="transition-25.1.1" level="project" />
136+
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
137+
<orderEntry type="library" exported="" name="cardview-v7-25.0.0" level="project" />
133138
<orderEntry type="library" exported="" name="support-core-ui-25.1.1" level="project" />
139+
<orderEntry type="library" exported="" name="bolts-android-1.4.0" level="project" />
134140
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
141+
<orderEntry type="library" exported="" name="customtabs-25.0.0" level="project" />
135142
<orderEntry type="library" exported="" name="support-core-utils-25.1.1" level="project" />
136143
<orderEntry type="library" exported="" name="support-fragment-25.1.1" level="project" />
137144
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
@@ -144,6 +151,7 @@
144151
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
145152
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
146153
<orderEntry type="library" exported="" name="converter-gson-2.0.2" level="project" />
154+
<orderEntry type="library" exported="" name="facebook-android-sdk-4.19.0" level="project" />
147155
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
148156
<orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" />
149157
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
@@ -152,6 +160,7 @@
152160
<orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
153161
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />
154162
<orderEntry type="library" exported="" name="tweet-composer-2.3.1" level="project" />
163+
<orderEntry type="library" exported="" name="bolts-applinks-1.4.0" level="project" />
155164
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
156165
<orderEntry type="library" exported="" name="appcompat-v7-25.1.1" level="project" />
157166
<orderEntry type="library" exported="" name="twitter-core-2.3.0" level="project" />

‎src/AndroidClient/androidchat/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ dependencies {
5555
compile project(':android')
5656
compile 'com.android.support:appcompat-v7:25.1.1'
5757
compile 'com.android.support:design:25.1.1'
58-
testCompile 'junit:junit:4.12'
5958
compile 'net.servicestack:android:1.0.27'
59+
compile 'com.facebook.android:facebook-android-sdk:[4,5)'
6060
compile('com.twitter.sdk.android:twitter:2.3.1@aar') {
6161
transitive = true;
6262
}
63+
testCompile 'junit:junit:4.12'
6364
}

0 commit comments

Comments
 (0)