julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Current shape is now saved

Browse Source
This commit is contained in:
=
2017-10-27 17:43:04 +02:00
parent 757c13c31c
commit 0bc6a09d17
251 changed files with 5076 additions and 11634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/build/outputs/logs/manifest-merger-debug-report.txt
View File

@ -1,18 +1,28 @@
-- Merging decision tree log ---
manifest
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:17:1-24:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
package
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:3:5-36
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:versionName
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:versionCode
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:11-69
android:versionCode
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
uses-feature#0x00020000
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:5:5-7:35
android:glEsVersion
@ -21,16 +31,18 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:7:9-32
application
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:9:5-26:19
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\AndroidManifest.xml:22:5-20
android:label
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:12:9-41
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:22:5-20
android:supportsRtl
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:13:9-35
android:allowBackup
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:10:9-35
android:label
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:12:9-41
android:icon
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:11:9-43
android:allowBackup
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:10:9-35
android:theme
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:14:9-40
activity#de.frajul.endlessroll.main.GameActivity
@ -53,11 +65,19 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:27-74
uses-sdk
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\AndroidManifest.xml:20:5-43
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\12e0c2a30c07ceb4797ac17db42dd2d3\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\a5b33ad9be379cd61c652c43b13be455\AndroidManifest.xml:20:5-43
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml