Skip to content

Commit 34b6eb4

Browse files
nikhilgohil11nikhilgohil11
authored
Merge pull request #4 from builtio-contentstack/development
Development
2 parents 482dab6 + 7b57875 commit 34b6eb4

File tree

2 files changed

+49
-45
lines changed

2 files changed

+49
-45
lines changed

‎contentstack-android.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
16+
<orderEntry type="inheritedJdk" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎contentstack/contentstack.iml‎

Lines changed: 48 additions & 44 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.id=":contentstack" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="built.io-contentstack-android-sdk" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":contentstack" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -8,11 +8,11 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="release" />
12-
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<afterSyncTasks>
15-
<task>generateReleaseSources</task>
15+
<task>generateDebugSources</task>
1616
</afterSyncTasks>
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,32 +23,39 @@
2323
</configuration>
2424
</facet>
2525
</component>
26-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
27-
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/release" />
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/release" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/release" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5259
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5360
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5461
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -70,7 +77,6 @@
7077
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7178
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7279
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/Contentstack-jar" />
7480
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
7581
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7682
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -87,25 +93,23 @@
8793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8894
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8995
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
9196
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
9397
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9498
</content>
9599
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
96100
<orderEntry type="sourceFolder" forTests="false" />
97-
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
98-
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
99-
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
100-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
101-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
102-
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
103-
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
104-
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
105-
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
106-
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
107-
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
108-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
101+
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
102+
<orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
103+
<orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
104+
<orderEntry type="library" exported="" name="com.android.support:support-core-utils-25.3.1" level="project" />
105+
<orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
106+
<orderEntry type="library" exported="" name="com.android.support:support-v4-25.3.1" level="project" />
107+
<orderEntry type="library" exported="" name="com.android.support:support-fragment-25.3.1" level="project" />
108+
<orderEntry type="library" exported="" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
109+
<orderEntry type="library" exported="" name="com.android.support:support-core-ui-25.3.1" level="project" />
110+
<orderEntry type="library" exported="" name="com.android.support:support-media-compat-25.3.1" level="project" />
111+
<orderEntry type="library" exported="" name="com.android.support:appcompat-v7-25.3.1" level="project" />
112+
<orderEntry type="library" exported="" name="com.android.support:support-compat-25.3.1" level="project" />
109113
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-25" level="project" />
110114
</component>
111115
</module>

0 commit comments

Comments
 (0)