Skip to content
Snippets Groups Projects
Commit 43828c8b authored by Dennis Kupczyk's avatar Dennis Kupczyk
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/gradle.xml
#	.idea/jarRepositories.xml
#	.idea/misc.xml
#	.idea/modules.xml
#	build.gradle
parents e797b142 934c8997
No related branches found
No related tags found
No related merge requests found
Pipeline #13771 failed
Stage: environment
Stage: build
Stage: test
Stage: internal
Stage: alpha
Stage: beta
Stage: production
Hide whitespace changes
Inline Side-by-side
Showing
with 248 additions and 0 deletions
.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml 0 → 100644
+ 11
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.core:common:1.1.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/ae9b923fc99c1fc5a7a9b6cedc6df8b2b8529c54/common-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.core:runtime:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/4fd0ecd0e1a71d15b75f919eefe8e120/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/982b1651c61a1e43381275001909e25e/transformed/runtime-1.1.1/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/982b1651c61a1e43381275001909e25e/transformed/runtime-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/982b1651c61a1e43381275001909e25e/transformed/runtime-1.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.1/25df553df10af32bede9dd768a2d15299543d84/runtime-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml 0 → 100644
+ 11
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:common:1.1.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/bcdaa509a856d1430e736b102f899aa9870a8f83/common-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/6055469c6988cc95ed17e066d01d43fd/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7fbaba4578882c77456e0521bcd3b306/transformed/livedata-1.1.1/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/7fbaba4578882c77456e0521bcd3b306/transformed/livedata-1.1.1/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/7fbaba4578882c77456e0521bcd3b306/transformed/livedata-1.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata/1.1.1/bf27acaa4953c98cd519756ed7b7caacf94407d4/livedata-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/62b74cbbbf708abd5c1404976c5e6e1e/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/51db628cda75ab24d3da269200381e27/transformed/livedata-core-1.1.1/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/51db628cda75ab24d3da269200381e27/transformed/livedata-core-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/51db628cda75ab24d3da269200381e27/transformed/livedata-core-1.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.1/c38818e006ea7a408c05e3090364332d46494ef/livedata-core-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/2e1f2c26c40c8c60a1887105b9cd40d3/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c3ff2d7c959fd087bf0cb4cf25663b2f/transformed/runtime-1.1.1/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c3ff2d7c959fd087bf0cb4cf25663b2f/transformed/runtime-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c3ff2d7c959fd087bf0cb4cf25663b2f/transformed/runtime-1.1.1/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.1/8e4214221b3797b863dc9998d16abb4af043e784/runtime-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/fccea00281f070bcba0792c3287b2297/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/23b1ceb8e948c4ee3479ab151d08ef1d/transformed/viewmodel-1.1.1/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/23b1ceb8e948c4ee3479ab151d08ef1d/transformed/viewmodel-1.1.1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/23b1ceb8e948c4ee3479ab151d08ef1d/transformed/viewmodel-1.1.1/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.1/d1cc8e805317f171be63c68341f499acda7e42d6/viewmodel-1.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/7b96141e5bc873c161bcb6b1a731a942/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/ee3aea3c94b5d1ea471def3a01482175/transformed/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ee3aea3c94b5d1ea471def3a01482175/transformed/animated-vector-drawable-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/ee3aea3c94b5d1ea471def3a01482175/transformed/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3089ae728e86a173ab5567809f8e94e9/transformed/appcompat-v7-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3089ae728e86a173ab5567809f8e94e9/transformed/appcompat-v7-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/3089ae728e86a173ab5567809f8e94e9/transformed/appcompat-v7-28.0.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/3089ae728e86a173ab5567809f8e94e9/transformed/appcompat-v7-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/1286085a7451ce77d6d6ec8ee2224b6e/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/09acb03649e26185db2b3496e41a5b03/transformed/asynclayoutinflater-28.0.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/09acb03649e26185db2b3496e41a5b03/transformed/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/09acb03649e26185db2b3496e41a5b03/transformed/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml 0 → 100644
+ 9
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:collections:28.0.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml 0 → 100644
+ 11
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4e964893d795d3b307868e5a2fa5373f/transformed/constraint-layout-1.1.3/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/4e964893d795d3b307868e5a2fa5373f/transformed/constraint-layout-1.1.3/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/4e964893d795d3b307868e5a2fa5373f/transformed/constraint-layout-1.1.3/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3.xml 0 → 100644
+ 9
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml 0 → 100644
+ 14
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a7e66daa68aa3bcfd29bd929955460f7/transformed/coordinatorlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a7e66daa68aa3bcfd29bd929955460f7/transformed/coordinatorlayout-28.0.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/a7e66daa68aa3bcfd29bd929955460f7/transformed/coordinatorlayout-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/a7e66daa68aa3bcfd29bd929955460f7/transformed/coordinatorlayout-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/2cdaf7beb8c31295c3a70eeb0d1d4eb4/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/31d9a9f99b80bac00fc54628573e9394/transformed/cursoradapter-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/31d9a9f99b80bac00fc54628573e9394/transformed/cursoradapter-28.0.0/AndroidManifest.xml" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/31d9a9f99b80bac00fc54628573e9394/transformed/cursoradapter-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:customview:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/acca9bd6163e739488cb3485402eee19/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/23ba309fadbb1e79978aedcc55ad9a56/transformed/customview-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/23ba309fadbb1e79978aedcc55ad9a56/transformed/customview-28.0.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/23ba309fadbb1e79978aedcc55ad9a56/transformed/customview-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:documentfile:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/d43ba01ee9f51d02eeae745d100364bd/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8305c7c43d8da9bb91030e79d95e693/transformed/documentfile-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c8305c7c43d8da9bb91030e79d95e693/transformed/documentfile-28.0.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c8305c7c43d8da9bb91030e79d95e693/transformed/documentfile-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml 0 → 100644
+ 15
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f02162a2fcd5b4814734010426f6dfde/transformed/drawerlayout-28.0.0/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/a88d358f10b6f8a337802b448af603dd/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f02162a2fcd5b4814734010426f6dfde/transformed/drawerlayout-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/f02162a2fcd5b4814734010426f6dfde/transformed/drawerlayout-28.0.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/f02162a2fcd5b4814734010426f6dfde/transformed/drawerlayout-28.0.0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:interpolator:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/b79f5a311c54c90170c4622fa67ffcb1/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c25af3945b7d7e435492dd146814b880/transformed/interpolator-28.0.0/AndroidManifest.xml" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/c25af3945b7d7e435492dd146814b880/transformed/interpolator-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/c25af3945b7d7e435492dd146814b880/transformed/interpolator-28.0.0/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml 0 → 100644
+ 12
− 0
View file @ 43828c8b
<component name="libraryTable">
<library name="Gradle: com.android.support:loader:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/0aadaf84ee3016ded4315ce146ed1e2c/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-3/85ad9187720c985e4828b8d99f66e44f/transformed/loader-28.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/85ad9187720c985e4828b8d99f66e44f/transformed/loader-28.0.0/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-3/85ad9187720c985e4828b8d99f66e44f/transformed/loader-28.0.0/AndroidManifest.xml" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment