Skip to content

Commit 9f2ca25

Browse files
ishaileshmishraishaileshmishra
authored
Merge pull request #13 from contentstack/dev
Dev
2 parents a6eec12 + 7c7664a commit 9f2ca25

File tree

4 files changed

+50
-80
lines changed

4 files changed

+50
-80
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.7.0
4+
###### Date: 15-Nov-2019
5+
- [Stack]: Added support for function getContentType()
6+
- [ContentType]: updated function fetch()
7+
- [Query]: Updated support of whereIn(String KEY, Query queryObject)
8+
- [Query]: Updated support of whereNotIn(String KEY, Query queryObject)
9+
10+
------------------------------------------------
11+
312
### Version: 3.6.1
413
###### Date: 23-Aug-2019
514
- [Query] - Added support for whereIn(String key) and whereNotIn(String key) methods in Query

‎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.2'
10+
classpath 'com.android.tools.build:gradle:3.5.2'
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1212
}
1313
}

‎contentstack/contentstack.iml‎

Lines changed: 38 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":contentstack" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -25,23 +27,23 @@
2527
</facet>
2628
</component>
2729
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
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" />
30+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
3032
<exclude-output />
3133
<content url="file://$MODULE_DIR$">
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3537
<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" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4042
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4143
<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" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
46+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
4547
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -70,91 +72,50 @@
7072
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7173
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7274
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8277
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8378
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8479
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8580
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_library_classes" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
117-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
118-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/runtime_library_classes" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
120-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
121-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
122-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
123-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
124-
<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" />
127-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
128-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
129-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
13090
</content>
13191
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
13292
<orderEntry type="sourceFolder" forTests="false" />
133-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
134-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
135-
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
136-
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
93+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
94+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
95+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
96+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
97+
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
13798
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
99+
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
100+
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
138101
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
139-
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
102+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
103+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
104+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
140105
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:23.1.0@jar" level="project" />
141-
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
142-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
143-
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
144-
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:26.1.0@aar" level="project" />
145-
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
146106
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
147-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
107+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
148108
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:26.1.0@aar" level="project" />
149-
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:26.1.0@aar" level="project" />
109+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
150110
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:26.1.0@aar" level="project" />
151-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
152-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
153-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
154-
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
111+
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
112+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
113+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:26.1.0@aar" level="project" />
114+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:26.1.0@aar" level="project" />
155115
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:26.1.0@aar" level="project" />
156-
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
157-
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
116+
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
117+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
118+
<orderEntry type="library" name="Gradle: com.android.volley:volley:1.1.1@aar" level="project" />
158119
<orderEntry type="library" name="Gradle: org.apache.http.legacy-android-26" level="project" />
159120
</component>
160121
</module>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Apr 25 21:26:47 IST 2019
1+
#Thu Nov 14 11:47:24 IST 2019
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-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)