Skip to content

Commit e651846

Browse files
DeveloperPaul123DeveloperPaul123
committed
Removed "FPlib" folder. Cleaned up merging
1 parent c8d94bc commit e651846

File tree

3 files changed

+8
-39
lines changed

3 files changed

+8
-39
lines changed

‎FPlib/src/main/res/values-es/strings.xml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎app/app.iml‎

Lines changed: 8 additions & 31 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=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="FilePickerLibrary" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<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="FilePickerDemo" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,7 +12,10 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1517
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
1619
<task>generateDebugSources</task>
1720
</afterSyncTasks>
1821
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -25,7 +28,7 @@
2528
</component>
2629
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2730
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
2932
<exclude-output />
3033
<content url="file://$MODULE_DIR$">
3134
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -47,13 +50,6 @@
4750
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4851
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5753
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5854
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5955
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -68,40 +64,21 @@
6864
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6965
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7066
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7867
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79-
<<<<<<< HEAD
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8069
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
8271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.DeveloperPaul123/MaterialLibrary/1.0.5/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
93-
=======
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
9773
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
9874
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
9975
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
10076
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
10177
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.DeveloperPaul123/MaterialLibrary/1.0.5/jars" />
10278
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
10379
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
104-
>>>>>>> 68c852d17ee457390c69f9cc460e780d04a3c0df
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
10582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10683
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10784
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

‎app/build.gradle‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,8 @@ android {
2323

2424
dependencies {
2525
compile fileTree(include: ['*.jar'], dir: 'libs')
26-
<<<<<<< HEAD
2726
// compile 'com.github.DeveloperPaul123:FilePickerLibrary:2.1'
28-
compile project(":FPlib")
29-
=======
3027
compile project(':library')
31-
>>>>>>> 68c852d17ee457390c69f9cc460e780d04a3c0df
3228
compile 'com.github.DeveloperPaul123:MaterialLibrary:1.0.5'
3329
compile 'com.jakewharton:butterknife:7.0.1'
3430
}

0 commit comments

Comments
 (0)