Skip to content

Commit 026d169

Browse files
mythzmythz
committed
Update Android Studio proj files
1 parent e40d356 commit 026d169

File tree

7 files changed

+56
-62
lines changed

7 files changed

+56
-62
lines changed

‎src/AndroidClient/.idea/inspectionProfiles/Project_Default.xml‎

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

‎src/AndroidClient/.idea/inspectionProfiles/profiles_settings.xml‎

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

‎src/AndroidClient/android/android.iml‎

Lines changed: 10 additions & 13 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/test/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,8 +76,14 @@
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
9189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -95,7 +93,6 @@
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9996
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10097
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10198
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
@@ -105,7 +102,7 @@
105102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
106103
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
107104
</content>
108-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
105+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
109106
<orderEntry type="sourceFolder" forTests="false" />
110107
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
111108
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
@@ -114,6 +111,6 @@
114111
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
115112
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
116113
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
117-
<orderEntry type="library" exported="" name="android-android-23" level="project" />
114+
<orderEntry type="library" exported="" name="android-android-24" level="project" />
118115
</component>
119116
</module>

‎src/AndroidClient/app/app.iml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,20 @@
8383
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
8990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
9091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9496
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
9598
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
96100
</content>
97101
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
98102
<orderEntry type="sourceFolder" forTests="false" />

‎src/AndroidClient/kotlin/kotlin.iml‎

Lines changed: 8 additions & 10 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/test/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,8 +76,15 @@
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -104,7 +103,6 @@
104103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
105104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
106105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
108106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
109107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
110108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />

‎src/AndroidClient/techstacks/techstacks.iml‎

Lines changed: 8 additions & 19 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,7 +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" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
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" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -97,21 +96,11 @@
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
9998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
10299
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
107100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
109101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
111102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
113103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
115104
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
116105
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
117106
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />

‎src/AndroidClient/techstackskotlin/techstackskotlin.iml‎

Lines changed: 8 additions & 19 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,7 +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" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
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" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -99,21 +98,11 @@
9998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
10099
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
101100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
104101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
109102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
111103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
113104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
115105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
117106
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
118107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
119108
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />

0 commit comments

Comments
 (0)