Skip to content

Commit 8066db3

Browse files
ishaileshmishraishaileshmishra
authored
Merge pull request #10 from contentstack/development
Development
2 parents 9320174 + 1f357bb commit 8066db3

File tree

4 files changed

+35
-67
lines changed

4 files changed

+35
-67
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
## CHANGELOG
22

3+
### Version: 3.6.1
4+
###### Date: 23-Aug-2019
5+
- [Query] - Added support for whereIn(String key) and whereNotIn(String key) methods in Query
6+
- [Config] - Added support for setRegion(ContentstackRegion region) in Config class.
7+
8+
9+
------------------------------------------------
10+
11+
312
### Version: 3.6.0
413
###### Date: 26-July-2019
514
- [Entry] - Added support for includeReferenceContentTypeUid support in Entry.

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.4.0'
10+
classpath 'com.android.tools.build:gradle:3.4.2'
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1212
}
1313
}

‎contentstack/contentstack.iml‎

Lines changed: 24 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8,82 +8,40 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="apiDebug" />
12-
<option name="ASSEMBLE_TASK_NAME" value="assembleApiDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileApiDebugSources" />
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>generateApiDebugSources</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" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/api/debug" />
21-
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/api/debug" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
21+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
2222
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2323
<option name="PROJECT_TYPE" value="1" />
2424
</configuration>
2525
</facet>
2626
</component>
2727
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
28-
<output url="file://$MODULE_DIR$/build/intermediates/javac/apiDebug/compileApiDebugJavaWithJavac/classes" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/apiDebugUnitTest/compileApiDebugUnitTestJavaWithJavac/classes" />
28+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
3030
<exclude-output />
3131
<content url="file://$MODULE_DIR$">
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/api/debug" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/apiDebug/compileApiDebugAidl/out" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/api/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/apiDebug/compileApiDebugRenderscript/out" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/api/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/api/debug" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/res" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/resources" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/assets" type="java-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/aidl" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/java" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/rs" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/apiDebug/shaders" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/api/debug" isTestSource="true" generated="true" />
46-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/apiDebugAndroidTest/compileApiDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
47-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/api/debug" isTestSource="true" generated="true" />
48-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/apiDebugAndroidTest/compileApiDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/api/debug" type="java-test-resource" />
50-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/api/debug" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/res" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/resources" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/assets" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/aidl" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/java" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/rs" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApiDebug/shaders" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/api/debug" isTestSource="true" generated="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/res" type="java-test-resource" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/resources" type="java-test-resource" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/assets" type="java-test-resource" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/aidl" isTestSource="true" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/java" isTestSource="true" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/rs" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/testApiDebug/shaders" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/api/res" type="java-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/api/resources" type="java-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/api/assets" type="java-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/api/aidl" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/api/java" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/api/rs" isTestSource="false" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/api/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/testApi/shaders" isTestSource="true" />
80-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/res" type="java-test-resource" />
81-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/resources" type="java-test-resource" />
82-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/assets" type="java-test-resource" />
83-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/aidl" isTestSource="true" />
84-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/java" isTestSource="true" />
85-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/rs" isTestSource="true" />
86-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestApi/shaders" isTestSource="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" 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/apt/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" 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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
8745
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
8846
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
8947
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -148,8 +106,6 @@
148106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
149107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
150108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
151-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
152-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_publish_jar" />
153109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
154110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
155111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -166,7 +122,10 @@
166122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
167123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
168124
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
125+
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
169127
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
128+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
170129
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
171130
</content>
172131
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />

‎contentstack/proguard-rules.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# directive in build.gradle.
66
#
77
# For more details, see
8-
# http://developer.android.com/guide/developing/tools/proguard.html
8+
# http://developer.android.com/guide/developing/tools/proguard.html
99

1010
# Add any project specific keep options here:
1111

0 commit comments

Comments
 (0)