Skip to content

Commit a334b3f

Browse files
ChinmayAcharya28ChinmayAcharya28
authored
Merge branch 'master' into development
2 parents f2e51e6 + a72ca4d commit a334b3f

File tree

4 files changed

+39
-19
lines changed

4 files changed

+39
-19
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎contentstack-android.iml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id="contentstack-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
8+
</configuration>
9+
</facet>
10+
</component>
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
12+
<exclude-output />
13+
<content url="file://$MODULE_DIR$">
14+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
15+
</content>
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
17+
<orderEntry type="sourceFolder" forTests="false" />
18+
</component>
19+
</module>

‎contentstack/contentstack.iml‎

Lines changed: 17 additions & 16 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,6 @@
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2120
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2221
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23-
<option name="LIBRARY_PROJECT" value="true" />
2422
</configuration>
2523
</facet>
2624
</component>
@@ -48,53 +46,56 @@
4846
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5451
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5552
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5653
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5754
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5855
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
6056
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6157
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6258
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6359
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6460
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6561
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6662
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6863
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6964
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7865
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7966
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8067
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8168
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8269
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8470
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8571
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8681
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8782
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
9085
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
9797
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9899
</content>
99100
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
100101
<orderEntry type="sourceFolder" forTests="false" />

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Nov 30 12:40:08 IST 2016
1+
#Fri Jun 23 10:50:04 IST 2017
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.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)