From 4950329c9eb7fd5856710fdac6dc50001c7b92ad Mon Sep 17 00:00:00 2001 From: YipingPeng <43100360+YipingPeng@users.noreply.github.com> Date: Wed, 5 Feb 2020 16:31:12 -0700 Subject: [PATCH] add color yiping --- .DS_Store | Bin 0 -> 6148 bytes lab4/.idea/misc.xml | 2 +- lab4/app/app.iml | 272 +++++++++--------- .../bundle-manifest/AndroidManifest.xml | 38 +-- .../debug/AndroidManifest.xml | 40 +-- .../manifest-merger-blame-debug-report.txt | 20 +- ...-merger-blame-debug-androidTest-report.txt | 66 ++--- .../debug/AndroidManifest.xml | 38 +-- .../debugAndroidTest/AndroidManifest.xml | 84 +++--- .../logs/manifest-merger-debug-report.txt | 236 +++++++-------- .../src/main/java/com/example/lab4/Shape.java | 2 +- lab4/lab4.iml | 36 +-- lab4/local.properties | 16 +- 13 files changed, 425 insertions(+), 425 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8c61a69fb4765e79f58875013b5c6f270e78f0df GIT binary patch literal 6148 zcmeHK!A=4(5N!dqi!pLAkz+63I6y%0VzOEB;LT)>9@M~YmdGaSE`dd&h}qxJKk^Iw z9cS7?BxvHv7@0|?Z#tc6)3=*W%NXO%D5x=3VvGq;#GD1q7lPxcOOi7lM2>U#<6+;A z5+C|+OVQ-`iwxkmE3k-p%x8_y-_P$y;V`XM-+3-ySXga$5ua7uh zKtur>-x7$@plvYI2qPd|rvmC!Zk`xir-NUbINM;RQKvJmR)%@Z%G|tAxLO_jQiU^a zYowMKAO;p0$m?zi>;K93@BhUl>JbCPz`tUE7g}!1fi0QZy0kg0wGy-gih^;O#(4@D isuV*kmf|v~67Wkj0BwVrM(}{pML^L&4KeVm4156Ipim$H literal 0 HcmV?d00001 diff --git a/lab4/.idea/misc.xml b/lab4/.idea/misc.xml index dfd2c79..37a7509 100644 --- a/lab4/.idea/misc.xml +++ b/lab4/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/lab4/app/app.iml b/lab4/app/app.iml index b575ddf..ae3a9e9 100644 --- a/lab4/app/app.iml +++ b/lab4/app/app.iml @@ -1,137 +1,137 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/lab4/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index 5bd5d72..b0657c1 100644 --- a/lab4/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/lab4/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml @@ -1,21 +1,21 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/lab4/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/lab4/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index 90edd96..cb3a1ef 100644 --- a/lab4/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/lab4/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -1,22 +1,22 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/lab4/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/lab4/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index a6ac328..743f517 100644 --- a/lab4/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/lab4/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -6,26 +6,26 @@ 6 7 C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml +8-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml 9 android:targetSdkVersion="29" /> -9-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml +9-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml 10 11 C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:4:5-10:43 +11-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:4:5-10:43 12 android:allowBackup="true" -12-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:5:9-35 +12-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:5:9-35 13 android:appComponentFactory="androidx.core.app.CoreComponentFactory" -13-->[androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:22:18-86 +13-->[androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:22:18-86 14 android:debuggable="true" 15 android:icon="@mipmap/ic_launcher" -15-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:6:9-43 +15-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:6:9-43 16 android:label="@string/app_name" -16-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:7:9-41 +16-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:7:9-41 17 android:roundIcon="@mipmap/ic_launcher_round" -17-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:8:9-54 +17-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:8:9-54 18 android:supportsRtl="true" -18-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:9:9-35 +18-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:9:9-35 19 android:theme="@style/AppTheme" /> -19-->C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:10:9-40 +19-->/Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:10:9-40 20 21 diff --git a/lab4/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/lab4/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index dd0fda0..12ce1ae 100644 --- a/lab4/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/lab4/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,73 +3,73 @@ 3 package="com.example.lab4.test" > 4 5 C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:5:5-74 +5-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:5:5-74 6 android:minSdkVersion="15" -6-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:5:15-41 +6-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:5:15-41 7 android:targetSdkVersion="29" /> -7-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:5:42-71 +7-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:5:42-71 8 9 C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:11:5-15:66 +9-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:11:5-15:66 10 android:name="androidx.test.runner.AndroidJUnitRunner" -10-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:11:22-76 +10-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:11:22-76 11 android:functionalTest="false" -11-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:14:22-52 +11-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:14:22-52 12 android:handleProfiling="false" -12-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:13:22-53 +12-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:13:22-53 13 android:label="Tests for com.example.lab4" -13-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:15:22-64 +13-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:15:22-64 14 android:targetPackage="com.example.lab4" /> -14-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:12:22-62 +14-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:12:22-62 15 16 -16-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:24:5-72 -16-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:24:22-69 +16-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:24:5-72 +16-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:24:22-69 17 18 -18-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:7:5-9:19 -18-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:7:18-43 +18-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:7:5-9:19 +18-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:7:18-43 19 -19-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:8:9-60 -19-->C:\gitreport\lab4\lab4\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger3508977256526570230.xml:8:23-57 +19-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:8:9-60 +19-->/Users/crispeng/lab4/lab4/app/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger7418510271091555772.xml:8:23-57 20 21 [androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:27:9-33:20 +21-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:27:9-33:20 22 android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity" -22-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:28:13-99 +22-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:28:13-99 23 android:theme="@style/InstrumentationActivityInvokerBootstrapActivityTheme" > -23-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:29:13-88 +23-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:29:13-88 24 -24-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29 +24-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:30:13-32:29 25 -25-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69 -25-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66 +25-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:31:17-69 +25-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:31:25-66 26 27 28 [androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:34:9-40:20 +28-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:34:9-40:20 29 android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity" -29-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:35:13-95 +29-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:35:13-95 30 android:theme="@style/InstrumentationActivityInvokerEmptyActivityTheme" > -30-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:36:13-84 +30-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:36:13-84 31 -31-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29 +31-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:30:13-32:29 32 -32-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69 -32-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66 +32-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:31:17-69 +32-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:31:25-66 33 34 35 [androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:41:9-47:20 +35-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:41:9-47:20 36 android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity" -36-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:42:13-103 +36-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:42:13-103 37 android:theme="@style/InstrumentationActivityInvokerFloatingActivityTheme" > -37-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:43:13-87 +37-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:43:13-87 38 -38-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:30:13-32:29 +38-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:30:13-32:29 39 -39-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:17-69 -39-->[androidx.test:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61e5e7e4c8c93d43f3f06edf87848d5f\core-1.1.0\AndroidManifest.xml:31:25-66 +39-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:31:17-69 +39-->[androidx.test:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61e5e7e4c8c93d43f3f06edf87848d5f/core-1.1.0/AndroidManifest.xml:31:25-66 40 41 42 diff --git a/lab4/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/lab4/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 5bd5d72..b0657c1 100644 --- a/lab4/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/lab4/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -1,21 +1,21 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/lab4/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/lab4/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml index ca5188e..f6ca63f 100644 --- a/lab4/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml +++ b/lab4/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4/app/build/outputs/logs/manifest-merger-debug-report.txt b/lab4/app/build/outputs/logs/manifest-merger-debug-report.txt index 6284908..2e36109 100644 --- a/lab4/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/lab4/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,135 +1,135 @@ -- Merging decision tree log --- manifest -ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 -MERGED from [androidx.appcompat:appcompat:1.0.2] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\697f71c0c12135256cbfe98df498a7e4\appcompat-1.0.2\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.fragment:fragment:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4f680f5cab482b7966fa9c805ac0cb70\fragment-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61965e5c06bda9445c13760f9d9ef779\vectordrawable-animated-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ec593f8d91037f6ef1bbcd6a177afa1c\legacy-support-core-ui-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4f8b5527496d67480951cc322460db7f\legacy-support-core-utils-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\62ec569ca307aebf19eb528ff2a14917\vectordrawable-1.0.1\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.loader:loader:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5276819c062a92c029464122749254f1\loader-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.viewpager:viewpager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4932f7e67b26f042b51fa62f1aa4816d\viewpager-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8849109129fcb2f39779166fb64480b1\coordinatorlayout-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\00bc847ce5b9e3ce7b40d465bffbf9e9\drawerlayout-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5ad830c9e1047f79e3f0f7e9e42ab8ab\slidingpanelayout-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.customview:customview:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\a3c457ded457b98b207b4f227d629399\customview-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3d4a3c67e39fa8d6d0c0f126c28b81d8\swiperefreshlayout-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\82b148795609bbbaf8e825fc2ff2a6bf\asynclayoutinflater-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:17:1-24:12 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c70a8bef3ed62675d42960780f476d6e\versionedparcelable-1.0.0\AndroidManifest.xml:17:1-25:12 -MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fb2fbe77879a57ea0c5dfd6fe59ba874\cursoradapter-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4c7e5b6d46acfb24c04b3a473c53b419\lifecycle-runtime-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.documentfile:documentfile:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\f582580d3eb247a74d915a27810a4674\documentfile-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c75155371656c04dff3a027cdeb13e8a\localbroadcastmanager-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.print:print:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\53b4a4cf87c0ff501a8c414cec884555\print-1.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\94d1bdd9d3f5e77b2c2deb76d0ecef77\lifecycle-viewmodel-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\63647da4654da12a6f2785cfbbad8123\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\733fc1d306cee2c05d3e1fb0b7527020\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fdd65d8b6066fd289a68b42931dc03a2\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [androidx.interpolator:interpolator:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3a992d8307f21a8f15eb649383ba6a6a\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 +ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 +MERGED from [androidx.appcompat:appcompat:1.0.2] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/697f71c0c12135256cbfe98df498a7e4/appcompat-1.0.2/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.fragment:fragment:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4f680f5cab482b7966fa9c805ac0cb70/fragment-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61965e5c06bda9445c13760f9d9ef779/vectordrawable-animated-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ec593f8d91037f6ef1bbcd6a177afa1c/legacy-support-core-ui-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4f8b5527496d67480951cc322460db7f/legacy-support-core-utils-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/62ec569ca307aebf19eb528ff2a14917/vectordrawable-1.0.1/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.loader:loader:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5276819c062a92c029464122749254f1/loader-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4932f7e67b26f042b51fa62f1aa4816d/viewpager-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8849109129fcb2f39779166fb64480b1/coordinatorlayout-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/00bc847ce5b9e3ce7b40d465bffbf9e9/drawerlayout-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5ad830c9e1047f79e3f0f7e9e42ab8ab/slidingpanelayout-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.customview:customview:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/a3c457ded457b98b207b4f227d629399/customview-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3d4a3c67e39fa8d6d0c0f126c28b81d8/swiperefreshlayout-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/82b148795609bbbaf8e825fc2ff2a6bf/asynclayoutinflater-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:17:1-24:12 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c70a8bef3ed62675d42960780f476d6e/versionedparcelable-1.0.0/AndroidManifest.xml:17:1-25:12 +MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fb2fbe77879a57ea0c5dfd6fe59ba874/cursoradapter-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4c7e5b6d46acfb24c04b3a473c53b419/lifecycle-runtime-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.documentfile:documentfile:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/f582580d3eb247a74d915a27810a4674/documentfile-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c75155371656c04dff3a027cdeb13e8a/localbroadcastmanager-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.print:print:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/53b4a4cf87c0ff501a8c414cec884555/print-1.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/94d1bdd9d3f5e77b2c2deb76d0ecef77/lifecycle-viewmodel-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/63647da4654da12a6f2785cfbbad8123/lifecycle-livedata-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/733fc1d306cee2c05d3e1fb0b7527020/lifecycle-livedata-core-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.arch.core:core-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fdd65d8b6066fd289a68b42931dc03a2/core-runtime-2.0.0/AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3a992d8307f21a8f15eb649383ba6a6a/interpolator-1.0.0/AndroidManifest.xml:17:1-22:12 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 package - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:2:5-31 - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:2:5-31 + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml android:versionName - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml android:versionCode - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:1-11:12 - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:1-11:12 + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml xmlns:android - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:1:11-69 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:1:11-69 application -ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:4:5-10:43 -MERGED from [androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:22:5-89 -MERGED from [androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:22:5-89 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c70a8bef3ed62675d42960780f476d6e\versionedparcelable-1.0.0\AndroidManifest.xml:22:5-23:19 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c70a8bef3ed62675d42960780f476d6e\versionedparcelable-1.0.0\AndroidManifest.xml:22:5-23:19 +ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:4:5-10:43 +MERGED from [androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:22:5-89 +MERGED from [androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:22:5-89 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c70a8bef3ed62675d42960780f476d6e/versionedparcelable-1.0.0/AndroidManifest.xml:22:5-23:19 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c70a8bef3ed62675d42960780f476d6e/versionedparcelable-1.0.0/AndroidManifest.xml:22:5-23:19 android:appComponentFactory - ADDED from [androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:22:18-86 + ADDED from [androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:22:18-86 android:supportsRtl - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:9:9-35 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:9:9-35 android:label - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:7:9-41 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:7:9-41 android:roundIcon - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:8:9-54 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:8:9-54 android:icon - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:6:9-43 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:6:9-43 android:allowBackup - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:5:9-35 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:5:9-35 android:theme - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml:10:9-40 + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml:10:9-40 uses-sdk -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml -MERGED from [androidx.appcompat:appcompat:1.0.2] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\697f71c0c12135256cbfe98df498a7e4\appcompat-1.0.2\AndroidManifest.xml:20:5-44 -MERGED from [androidx.appcompat:appcompat:1.0.2] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\697f71c0c12135256cbfe98df498a7e4\appcompat-1.0.2\AndroidManifest.xml:20:5-44 -MERGED from [androidx.fragment:fragment:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4f680f5cab482b7966fa9c805ac0cb70\fragment-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.fragment:fragment:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4f680f5cab482b7966fa9c805ac0cb70\fragment-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61965e5c06bda9445c13760f9d9ef779\vectordrawable-animated-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\61965e5c06bda9445c13760f9d9ef779\vectordrawable-animated-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ec593f8d91037f6ef1bbcd6a177afa1c\legacy-support-core-ui-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\ec593f8d91037f6ef1bbcd6a177afa1c\legacy-support-core-ui-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4f8b5527496d67480951cc322460db7f\legacy-support-core-utils-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4f8b5527496d67480951cc322460db7f\legacy-support-core-utils-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\62ec569ca307aebf19eb528ff2a14917\vectordrawable-1.0.1\AndroidManifest.xml:20:5-44 -MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\62ec569ca307aebf19eb528ff2a14917\vectordrawable-1.0.1\AndroidManifest.xml:20:5-44 -MERGED from [androidx.loader:loader:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5276819c062a92c029464122749254f1\loader-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.loader:loader:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5276819c062a92c029464122749254f1\loader-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.viewpager:viewpager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4932f7e67b26f042b51fa62f1aa4816d\viewpager-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.viewpager:viewpager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4932f7e67b26f042b51fa62f1aa4816d\viewpager-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8849109129fcb2f39779166fb64480b1\coordinatorlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8849109129fcb2f39779166fb64480b1\coordinatorlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\00bc847ce5b9e3ce7b40d465bffbf9e9\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\00bc847ce5b9e3ce7b40d465bffbf9e9\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5ad830c9e1047f79e3f0f7e9e42ab8ab\slidingpanelayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\5ad830c9e1047f79e3f0f7e9e42ab8ab\slidingpanelayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.customview:customview:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\a3c457ded457b98b207b4f227d629399\customview-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.customview:customview:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\a3c457ded457b98b207b4f227d629399\customview-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3d4a3c67e39fa8d6d0c0f126c28b81d8\swiperefreshlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3d4a3c67e39fa8d6d0c0f126c28b81d8\swiperefreshlayout-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\82b148795609bbbaf8e825fc2ff2a6bf\asynclayoutinflater-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\82b148795609bbbaf8e825fc2ff2a6bf\asynclayoutinflater-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:20:5-44 -MERGED from [androidx.core:core:1.0.1] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\8f8ab13dc8f4e84e14a8bb3d9ac92bc4\core-1.0.1\AndroidManifest.xml:20:5-44 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c70a8bef3ed62675d42960780f476d6e\versionedparcelable-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c70a8bef3ed62675d42960780f476d6e\versionedparcelable-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fb2fbe77879a57ea0c5dfd6fe59ba874\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fb2fbe77879a57ea0c5dfd6fe59ba874\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4c7e5b6d46acfb24c04b3a473c53b419\lifecycle-runtime-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\4c7e5b6d46acfb24c04b3a473c53b419\lifecycle-runtime-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.documentfile:documentfile:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\f582580d3eb247a74d915a27810a4674\documentfile-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.documentfile:documentfile:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\f582580d3eb247a74d915a27810a4674\documentfile-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c75155371656c04dff3a027cdeb13e8a\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\c75155371656c04dff3a027cdeb13e8a\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.print:print:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\53b4a4cf87c0ff501a8c414cec884555\print-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.print:print:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\53b4a4cf87c0ff501a8c414cec884555\print-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\94d1bdd9d3f5e77b2c2deb76d0ecef77\lifecycle-viewmodel-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\94d1bdd9d3f5e77b2c2deb76d0ecef77\lifecycle-viewmodel-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\63647da4654da12a6f2785cfbbad8123\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\63647da4654da12a6f2785cfbbad8123\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\733fc1d306cee2c05d3e1fb0b7527020\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\733fc1d306cee2c05d3e1fb0b7527020\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fdd65d8b6066fd289a68b42931dc03a2\core-runtime-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\fdd65d8b6066fd289a68b42931dc03a2\core-runtime-2.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.interpolator:interpolator:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3a992d8307f21a8f15eb649383ba6a6a\interpolator-1.0.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.interpolator:interpolator:1.0.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\3a992d8307f21a8f15eb649383ba6a6a\interpolator-1.0.0\AndroidManifest.xml:20:5-44 -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml -INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml reason: use-sdk injection requested +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml +MERGED from [androidx.appcompat:appcompat:1.0.2] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/697f71c0c12135256cbfe98df498a7e4/appcompat-1.0.2/AndroidManifest.xml:20:5-44 +MERGED from [androidx.appcompat:appcompat:1.0.2] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/697f71c0c12135256cbfe98df498a7e4/appcompat-1.0.2/AndroidManifest.xml:20:5-44 +MERGED from [androidx.fragment:fragment:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4f680f5cab482b7966fa9c805ac0cb70/fragment-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.fragment:fragment:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4f680f5cab482b7966fa9c805ac0cb70/fragment-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61965e5c06bda9445c13760f9d9ef779/vectordrawable-animated-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/61965e5c06bda9445c13760f9d9ef779/vectordrawable-animated-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ec593f8d91037f6ef1bbcd6a177afa1c/legacy-support-core-ui-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/ec593f8d91037f6ef1bbcd6a177afa1c/legacy-support-core-ui-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4f8b5527496d67480951cc322460db7f/legacy-support-core-utils-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4f8b5527496d67480951cc322460db7f/legacy-support-core-utils-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/62ec569ca307aebf19eb528ff2a14917/vectordrawable-1.0.1/AndroidManifest.xml:20:5-44 +MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/62ec569ca307aebf19eb528ff2a14917/vectordrawable-1.0.1/AndroidManifest.xml:20:5-44 +MERGED from [androidx.loader:loader:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5276819c062a92c029464122749254f1/loader-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.loader:loader:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5276819c062a92c029464122749254f1/loader-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4932f7e67b26f042b51fa62f1aa4816d/viewpager-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.viewpager:viewpager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4932f7e67b26f042b51fa62f1aa4816d/viewpager-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8849109129fcb2f39779166fb64480b1/coordinatorlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8849109129fcb2f39779166fb64480b1/coordinatorlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/00bc847ce5b9e3ce7b40d465bffbf9e9/drawerlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/00bc847ce5b9e3ce7b40d465bffbf9e9/drawerlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5ad830c9e1047f79e3f0f7e9e42ab8ab/slidingpanelayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/5ad830c9e1047f79e3f0f7e9e42ab8ab/slidingpanelayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.customview:customview:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/a3c457ded457b98b207b4f227d629399/customview-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.customview:customview:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/a3c457ded457b98b207b4f227d629399/customview-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3d4a3c67e39fa8d6d0c0f126c28b81d8/swiperefreshlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3d4a3c67e39fa8d6d0c0f126c28b81d8/swiperefreshlayout-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/82b148795609bbbaf8e825fc2ff2a6bf/asynclayoutinflater-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/82b148795609bbbaf8e825fc2ff2a6bf/asynclayoutinflater-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:20:5-44 +MERGED from [androidx.core:core:1.0.1] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/8f8ab13dc8f4e84e14a8bb3d9ac92bc4/core-1.0.1/AndroidManifest.xml:20:5-44 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c70a8bef3ed62675d42960780f476d6e/versionedparcelable-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c70a8bef3ed62675d42960780f476d6e/versionedparcelable-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fb2fbe77879a57ea0c5dfd6fe59ba874/cursoradapter-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fb2fbe77879a57ea0c5dfd6fe59ba874/cursoradapter-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4c7e5b6d46acfb24c04b3a473c53b419/lifecycle-runtime-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/4c7e5b6d46acfb24c04b3a473c53b419/lifecycle-runtime-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.documentfile:documentfile:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/f582580d3eb247a74d915a27810a4674/documentfile-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.documentfile:documentfile:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/f582580d3eb247a74d915a27810a4674/documentfile-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c75155371656c04dff3a027cdeb13e8a/localbroadcastmanager-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/c75155371656c04dff3a027cdeb13e8a/localbroadcastmanager-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.print:print:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/53b4a4cf87c0ff501a8c414cec884555/print-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.print:print:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/53b4a4cf87c0ff501a8c414cec884555/print-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/94d1bdd9d3f5e77b2c2deb76d0ecef77/lifecycle-viewmodel-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/94d1bdd9d3f5e77b2c2deb76d0ecef77/lifecycle-viewmodel-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/63647da4654da12a6f2785cfbbad8123/lifecycle-livedata-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/63647da4654da12a6f2785cfbbad8123/lifecycle-livedata-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/733fc1d306cee2c05d3e1fb0b7527020/lifecycle-livedata-core-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/733fc1d306cee2c05d3e1fb0b7527020/lifecycle-livedata-core-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.arch.core:core-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fdd65d8b6066fd289a68b42931dc03a2/core-runtime-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.arch.core:core-runtime:2.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/fdd65d8b6066fd289a68b42931dc03a2/core-runtime-2.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3a992d8307f21a8f15eb649383ba6a6a/interpolator-1.0.0/AndroidManifest.xml:20:5-44 +MERGED from [androidx.interpolator:interpolator:1.0.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/3a992d8307f21a8f15eb649383ba6a6a/interpolator-1.0.0/AndroidManifest.xml:20:5-44 +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml +INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml android:targetSdkVersion - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml android:minSdkVersion - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - ADDED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml - INJECTED from C:\gitreport\lab4\lab4\app\src\main\AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + ADDED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml + INJECTED from /Users/crispeng/lab4/lab4/app/src/main/AndroidManifest.xml diff --git a/lab4/app/src/main/java/com/example/lab4/Shape.java b/lab4/app/src/main/java/com/example/lab4/Shape.java index 68a066e..089ac17 100644 --- a/lab4/app/src/main/java/com/example/lab4/Shape.java +++ b/lab4/app/src/main/java/com/example/lab4/Shape.java @@ -3,5 +3,5 @@ public abstract class Shape { public int x; public int y; - String color = "black"; + String color = "blue"; } diff --git a/lab4/lab4.iml b/lab4/lab4.iml index 7b82f94..2bb7aef 100644 --- a/lab4/lab4.iml +++ b/lab4/lab4.iml @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lab4/local.properties b/lab4/local.properties index 592f3fd..90d9ce4 100644 --- a/lab4/local.properties +++ b/lab4/local.properties @@ -1,8 +1,8 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Wed Feb 05 15:49:04 MST 2020 -sdk.dir=C\:\\androidstudio\\sdk +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Wed Feb 05 16:24:56 MST 2020 +sdk.dir=/Users/crispeng/Library/Android/sdk