Skip to content

Commit c529317

Browse files
committed
Update android module to buildToolsVersion 23.0.2
1 parent fa841d4 commit c529317

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

src/AndroidClient/android/android.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2222
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2323
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
24-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
24+
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
2525
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2626
<option name="LIBRARY_PROJECT" value="true" />
2727
</configuration>

src/AndroidClient/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version = "1.0.20"
66

77
android {
88
compileSdkVersion 23
9-
buildToolsVersion "21.1.2"
9+
buildToolsVersion "23.0.2"
1010

1111
defaultConfig {
1212
minSdkVersion 15

src/AndroidClient/client/client.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,5 @@
3434
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
3535
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
3636
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
37-
<orderEntry type="library" exported="" name="client.client-1.0.20" level="project" />
3837
</component>
3938
</module>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 19 04:23:49 PST 2015
1+
#Wed Dec 09 06:42:57 PST 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip

src/AndroidClient/techstacks/techstacks.iml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,10 @@
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7674
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7775
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
7976
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8077
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8178
</content>

0 commit comments

Comments
 (0)