Created
August 11, 2017 17:16
-
-
Save mcepl/19b8bef0daef1e35b2205137418b856f to your computer and use it in GitHub Desktop.
differences in configuration generated by the Android Studio
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock | |
| index 05c1fc7..062df68 100644 | |
| Binary files a/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ | |
| diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin | |
| index 3d30b02..479b06c 100644 | |
| Binary files a/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ | |
| diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin | |
| index 1c20bc7..0d094ea 100644 | |
| Binary files a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ | |
| diff --git a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin | |
| index f03f997..4fdfd2b 100644 | |
| Binary files a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ | |
| diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin | |
| index 7910f92..c89e345 100644 | |
| Binary files a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ | |
| diff --git a/.idea/gradle.xml b/.idea/gradle.xml | |
| index 8d2df47..001e0f3 100644 | |
| --- a/.idea/gradle.xml | |
| +++ b/.idea/gradle.xml | |
| @@ -8,10 +8,11 @@ | |
| <option name="gradleJvm" value="1.8" /> | |
| <option name="modules"> | |
| <set> | |
| - <option value="$PROJECT_DIR$" /> | |
| - <option value="$PROJECT_DIR$/app" /> | |
| + <option value="$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList" /> | |
| + <option value="$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList/app" /> | |
| </set> | |
| </option> | |
| + <option name="resolveModulePerSourceSet" value="false" /> | |
| </GradleProjectSettings> | |
| </option> | |
| </component> | |
| diff --git a/.idea/misc.xml b/.idea/misc.xml | |
| index 178ddf8..95f0f03 100644 | |
| --- a/.idea/misc.xml | |
| +++ b/.idea/misc.xml | |
| @@ -37,7 +37,7 @@ | |
| <ConfirmationsSetting value="0" id="Add" /> | |
| <ConfirmationsSetting value="0" id="Remove" /> | |
| </component> | |
| - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 22 Platform" project-jdk-type="Android SDK"> | |
| + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| <output url="file://$PROJECT_DIR$/build/classes" /> | |
| </component> | |
| <component name="ProjectType"> | |
| diff --git a/.idea/modules.xml b/.idea/modules.xml | |
| index 01c152a..4cf2b3a 100644 | |
| --- a/.idea/modules.xml | |
| +++ b/.idea/modules.xml | |
| @@ -2,8 +2,8 @@ | |
| <project version="4"> | |
| <component name="ProjectModuleManager"> | |
| <modules> | |
| - <module fileurl="file://$PROJECT_DIR$/ShoppingList.iml" filepath="$PROJECT_DIR$/ShoppingList.iml" /> | |
| - <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> | |
| + <module fileurl="file://$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList/ShoppingList.iml" filepath="$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList/ShoppingList.iml" /> | |
| + <module fileurl="file://$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList/app/app.iml" filepath="$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList/app/app.iml" /> | |
| </modules> | |
| </component> | |
| </project> | |
| \ No newline at end of file | |
| diff --git a/.idea/vcs.xml b/.idea/vcs.xml | |
| index 35eb1dd..6f0e28f 100644 | |
| --- a/.idea/vcs.xml | |
| +++ b/.idea/vcs.xml | |
| @@ -2,5 +2,6 @@ | |
| <project version="4"> | |
| <component name="VcsDirectoryMappings"> | |
| <mapping directory="" vcs="Git" /> | |
| + <mapping directory="$USER_HOME$/archiv/knihovna/repos/tmp/ShoppingList" vcs="Git" /> | |
| </component> | |
| </project> | |
| \ No newline at end of file | |
| diff --git a/ShoppingList.iml b/ShoppingList.iml | |
| index 2f00fc3..da2eaed 100644 | |
| --- a/ShoppingList.iml | |
| +++ b/ShoppingList.iml | |
| @@ -1,5 +1,5 @@ | |
| <?xml version="1.0" encoding="UTF-8"?> | |
| -<module external.linked.project.id="ShoppingList" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> | |
| +<module external.linked.project.id="ShoppingList" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/repos/tmp/ShoppingList" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> | |
| <component name="FacetManager"> | |
| <facet type="java-gradle" name="Java-Gradle"> | |
| <configuration> | |
| diff --git a/app/app.iml b/app/app.iml | |
| index 26668b5..2b3c8b0 100644 | |
| --- a/app/app.iml | |
| +++ b/app/app.iml | |
| @@ -1,5 +1,5 @@ | |
| <?xml version="1.0" encoding="UTF-8"?> | |
| -<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ShoppingList" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> | |
| +<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/repos/tmp/ShoppingList" external.system.id="GRADLE" external.system.module.group="ShoppingList" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> | |
| <component name="FacetManager"> | |
| <facet type="android-gradle" name="Android-Gradle"> | |
| <configuration> | |
| @@ -9,13 +9,9 @@ | |
| <facet type="android" name="Android"> | |
| <configuration> | |
| <option name="SELECTED_BUILD_VARIANT" value="debug" /> | |
| - <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> | |
| <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> | |
| <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> | |
| - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> | |
| - <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> | |
| <afterSyncTasks> | |
| - <task>generateDebugAndroidTestSources</task> | |
| <task>generateDebugSources</task> | |
| </afterSyncTasks> | |
| <option name="ALLOW_USER_CONFIGURATION" value="false" /> | |
| @@ -28,7 +24,7 @@ | |
| </component> | |
| <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> | |
| <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> | |
| - <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> | |
| + <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> | |
| <exclude-output /> | |
| <content url="file://$MODULE_DIR$"> | |
| <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> | |
| @@ -48,67 +44,66 @@ | |
| <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> | |
| - <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | |
| - <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> | |
| - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> | |
| <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.afollestad/material-dialogs/v0.7.7.0/jars" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | |
| + <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> | |
| + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> | |
| + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.0/jars" /> | |
| + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.0/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.2.1/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.1/jars" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" /> | |
| + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.2.0/jars" /> | |
| + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" /> | |
| + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getbase/floatingactionbutton/1.10.0/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.ge0rg/MemorizingTrustManager/9e30ffdf7d/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/aboutlibraries/5.1.1/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/iconics/1.2.0/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialdrawer/3.1.2/jars" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> | |
| <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> | |
| - <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> | |
| </content> | |
| <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> | |
| <orderEntry type="sourceFolder" forTests="false" /> | |
| + <orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" /> | |
| <orderEntry type="library" exported="" name="materialdrawer-3.1.2" level="project" /> | |
| <orderEntry type="library" exported="" name="gson-2.3.1" level="project" /> | |
| - <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" /> | |
| <orderEntry type="library" exported="" name="iconics-1.2.0" level="project" /> | |
| - <orderEntry type="library" exported="" name="recyclerview-v7-22.2.1" level="project" /> | |
| - <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" /> | |
| - <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" /> | |
| + <orderEntry type="library" exported="" name="recyclerview-v7-23.2.0" level="project" /> | |
| + <orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" /> | |
| <orderEntry type="library" exported="" name="material-dialogs-v0.7.7.0" level="project" /> | |
| <orderEntry type="library" exported="" name="aboutlibraries-5.1.1" level="project" /> | |
| <orderEntry type="library" exported="" name="floatingactionbutton-1.10.0" level="project" /> | |
| + <orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" /> | |
| + <orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" /> | |
| + <orderEntry type="library" exported="" name="animated-vector-drawable-23.2.0" level="project" /> | |
| + <orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" /> | |
| <orderEntry type="library" exported="" name="design-22.2.1" level="project" /> | |
| <orderEntry type="library" exported="" name="cardview-v7-22.2.1" level="project" /> | |
| <orderEntry type="library" exported="" name="MemorizingTrustManager-9e30ffdf7d" level="project" /> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
You could should ignore the .idea directory