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

Hopefully fixed bug that touch-detection is sometimes very slow

Browse Source
This commit is contained in:
julian 2018-06-22 17:07:56 +02:00
parent b28877e08e
commit 1010ddf46d
36 changed files with 476 additions and 761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.name generated
View File

@ -1 +0,0 @@
EndlessRoll

228
.idea/codeStyleSettings.xml generated
View File

@ -1,228 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="android" withSubpackages="true" static="false" />
<emptyLine />
<package name="com" withSubpackages="true" static="false" />
<emptyLine />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="net" withSubpackages="true" static="false" />
<emptyLine />
<package name="org" withSubpackages="true" static="false" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" />
<emptyLine />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="true" />
<emptyLine />
</value>
</option>
<option name="RIGHT_MARGIN" value="100" />
<AndroidXmlCodeStyleSettings>
<option name="USE_CUSTOM_SETTINGS" value="true" />
</AndroidXmlCodeStyleSettings>
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" />
<pair source="c" header="h" />
</extensions>
</Objective-C-extensions>
<XML>
<option name="XML_KEEP_LINE_BREAKS" value="false" />
<option name="XML_ALIGN_ATTRIBUTES" value="false" />
<option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
</XML>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:layout_width</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:layout_height</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:layout_.*</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:width</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:height</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</value>
</option>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
</component>
</project>

22
.idea/compiler.xml generated
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>

3
.idea/copyright/profiles_settings.xml generated
View File

@ -1,3 +0,0 @@
<component name="CopyrightManager">
<settings default="" />
</component>

6
.idea/encodings.xml generated
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

7
.idea/gradle.xml generated
View File

@ -5,12 +5,11 @@
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/particlelab" />
<option value="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll" />
<option value="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app" />
<option value="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/particlelab" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />

10
.idea/inspectionProfiles/Project_Default.xml generated
View File

@ -1,10 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AndroidLintRtlCompat" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile>
</component>

7
.idea/inspectionProfiles/profiles_settings.xml generated
View File

@ -1,7 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>

9
.idea/misc.xml generated
View File

@ -5,11 +5,12 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="4">
<list size="5">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
@ -24,7 +25,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

6
.idea/modules.xml generated
View File

@ -2,9 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/EndlessRoll.iml" filepath="$PROJECT_DIR$/EndlessRoll.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/particlelab/particlelab.iml" filepath="$PROJECT_DIR$/particlelab/particlelab.iml" />
<module fileurl="file:///mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/EndlessRoll.iml" filepath="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/EndlessRoll.iml" />
<module fileurl="file:///mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/app.iml" filepath="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/app.iml" />
<module fileurl="file:///mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/particlelab/particlelab.iml" filepath="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/particlelab/particlelab.iml" />
</modules>
</component>
</project>

1
.idea/vcs.xml generated
View File

@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll" vcs="Git" />
</component>
</project>

2
EndlessRoll.iml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="EndlessRoll" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id="EndlessRoll" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/Julian/AndroidStudioProjects/EndlessRoll" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>

4
app/app.iml
View File

@ -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" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/Julian/AndroidStudioProjects/EndlessRoll" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@ -111,6 +111,7 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.1" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/libs/simple-xml-2.7.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
@ -121,7 +122,6 @@
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Julian\AndroidStudioProjects\EndlessRoll\app\libs\simple-xml-2.7.1.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:customtabs-26.1.0" level="project" />

2
app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/colorChange.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\colorChange.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/snow.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\snow.pe"/><file name="particleEffects/snow.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\snow.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="particleEffects/stasis.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\stasis.pe"/><file name="particleEffects/superPower.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\superPower.pe"/><file name="particleEffects/test_fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\test_fire.pe"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/obstacleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\obstacleFragmentShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainFragmentShader.glsl"/><file name="shader/guiVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\guiVertexShader.glsl"/><file name="shader/guiFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\guiFragmentShader.glsl"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets"><file name="fontBaron.ttf" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/levelpacks/Grasslands.xml"/><file name="levelpacks/Icy Mountains.xml" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/levelpacks/Icy Mountains.xml"/><file name="particleEffects/collectEnergy.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/collectStar.pe"/><file name="particleEffects/colorChange.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/colorChange.pe"/><file name="particleEffects/explosion.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/explosion.pe"/><file name="particleEffects/firework.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/firework.pe"/><file name="particleEffects/magnet.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/magnet.pe"/><file name="particleEffects/particle.png" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/particle.png"/><file name="particleEffects/snow.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/snow.pe"/><file name="particleEffects/snow.png" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/snow.png"/><file name="particleEffects/star.png" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/star.png"/><file name="particleEffects/stasis.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/stasis.pe"/><file name="particleEffects/superPower.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/superPower.pe"/><file name="particleEffects/test_fire.pe" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/particleEffects/test_fire.pe"/><file name="shader/entityFragmentShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/entityVertexShader.glsl"/><file name="shader/guiFragmentShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/guiFragmentShader.glsl"/><file name="shader/guiVertexShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/guiVertexShader.glsl"/><file name="shader/obstacleFragmentShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/obstacleFragmentShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/simpleVertexShader.glsl"/><file name="shader/terrainFragmentShader.glsl" path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/assets/shader/terrainFragmentShader.glsl"/></source><source path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/build/generated/assets/shaders/debug"/></dataSet><dataSet config="debug"><source path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/debug/assets"/></dataSet></merger>

428
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

2
app/build/intermediates/incremental/mergeDebugShaders/merger.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\shaders"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/debug/shaders"/></dataSet></merger>

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

@ -1,196 +1,196 @@
-- 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\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:17:1-24:12
MERGED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:17:1-25:12
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:17:1-24:12
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:17:1-36:12
MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:2:1-9:12
MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:17:1-28:12
MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:17:1-28:12
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:17:1-31:12
MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:17:1-30: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
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:17:1-24:12
MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:17:1-25:12
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:17:1-24:12
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:17:1-36:12
MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:2:1-9:12
MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:17:1-28:12
MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:17:1-28:12
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:17:1-31:12
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:17:1-31:12
MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:17:1-30:12
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/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
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:3:5-36
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
INJECTED from /mnt/FE6CC35E6CC31077/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
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/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
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
INJECTED from /mnt/FE6CC35E6CC31077/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
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:11-69
uses-feature#0x00020000
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:5:5-7:35
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:5:5-7:35
android:glEsVersion
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:6:9-41
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:6:9-41
android:required
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:7:9-32
ADDED from /mnt/FE6CC35E6CC31077/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\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\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\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:26:5-34:19
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:26:5-34:19
MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:7:5-20
MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:7:5-20
MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:22:5-26:19
MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:22:5-26:19
MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:22:5-26:19
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:22:5-26:19
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:25:5-29:19
MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:24:5-28:19
MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:24:5-28:19
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:5-26:19
MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:26:5-34:19
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:26:5-34:19
MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:7:5-20
MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:7:5-20
MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:22:5-26:19
MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:22:5-26:19
MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:22:5-26:19
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:22:5-26:19
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:25:5-29:19
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:25:5-29:19
MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:24:5-28:19
MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:24:5-28:19
android:supportsRtl
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:13:9-35
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:13:9-35
android:label
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:12:9-41
ADDED from /mnt/FE6CC35E6CC31077/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
ADDED from /mnt/FE6CC35E6CC31077/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
ADDED from /mnt/FE6CC35E6CC31077/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
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:14:9-40
activity#de.frajul.endlessroll.main.GameActivity
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:16:9-25:20
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:16:9-25:20
android:screenOrientation
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:19:13-50
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:19:13-50
android:configChanges
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:18:13-74
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:18:13-74
android:name
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:17:13-46
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:17:13-46
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:20:13-24:29
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:20:13-24:29
action#android.intent.action.MAIN
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:21:17-69
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:17-69
android:name
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:21:25-66
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:25-66
category#android.intent.category.LAUNCHER
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:17-77
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:23:17-77
android:name
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:23:27-74
ADDED from /mnt/FE6CC35E6CC31077/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
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\d874715e6054e786cbcfdf9c2b37e7ce\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\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:20:5-43
MERGED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:21:5-23:62
MERGED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:21:5-23:62
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-identifier-15.0.1.aar\e013bd34e4820b5b8b5f6cc8eb14d99e\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:5:5-44
MERGED from [com.google.android.gms:play-services-gass:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-gass-15.0.0.aar\09bbd78b1d14cdc00971037973436219\AndroidManifest.xml:5:5-44
MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:21:5-23:54
MERGED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:21:5-23:54
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-base-15.0.0.aar\de0181d688aff37b5d388d3e79e6ee8a\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:21:5-23:63
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:21:5-23:63
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:21:5-23:60
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:21:5-23:60
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:21:5-23:61
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:21:5-23:61
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:21:5-23:58
MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:20:5-22:41
MERGED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:20:5-22:41
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/129292706d58eaa2ec38773c9ee9276e/AndroidManifest.xml:20:5-43
MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:21:5-23:62
MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:21:5-23:62
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/fc6693aec41de5c870b5746aa4de9f10/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:5:5-44
MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/1393512dd54bd99f0e67cd94c3fa42c8/AndroidManifest.xml:5:5-44
MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:21:5-23:54
MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:21:5-23:54
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:20:5-44
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:20:5-44
MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/c12d7e6acac8b0f0add805538afc1b0c/AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:21:5-23:63
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:21:5-23:63
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:21:5-23:60
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:21:5-23:60
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:21:5-23:61
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:21:5-23:61
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:21:5-23:58
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:21:5-23:58
MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:20:5-22:41
MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:20:5-22:41
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
tools:overrideLibrary
ADDED from [com.google.android.gms:play-services-ads:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-15.0.0.aar\c17881fb20ad35b7a93340038dbc91bc\AndroidManifest.xml:23:9-59
ADDED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/1727ceccb3bfaf1e1249c68b1acb9ca2/AndroidManifest.xml:23:9-59
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
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
INJECTED from /mnt/FE6CC35E6CC31077/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
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
uses-permission#android.permission.INTERNET
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:23:5-67
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:23:5-67
android:name
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:23:22-64
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:23:22-64
uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:24:5-79
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:24:5-79
android:name
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:24:22-76
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:24:22-76
activity#com.google.android.gms.ads.AdActivity
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:29:9-33:64
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:29:9-33:64
android:exported
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:32:13-37
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:32:13-37
android:configChanges
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:31:13-122
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:31:13-122
android:theme
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:33:13-61
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:33:13-61
android:name
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-ads-lite-15.0.0.aar\b1b3b3dff26f11375713cb6940c1ea9f\AndroidManifest.xml:30:13-65
ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/4e1ea8a95d3b5f60ea4d71f6b069fbdb/AndroidManifest.xml:30:13-65
meta-data#com.google.android.gms.version
ADDED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:23:9-25:69
ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:23:9-25:69
android:value
ADDED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:25:13-66
ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:25:13-66
android:name
ADDED from [com.google.android.gms:play-services-basement:15.0.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\play-services-basement-15.0.1.aar\fdbbe3f8d397b1a467f51f5054376050\AndroidManifest.xml:24:13-58
ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/eecbca62aba1ebef742a1b48098a6aa9/AndroidManifest.xml:24:13-58
meta-data#android.support.VERSION
ADDED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:23:9-25:38
MERGED from [com.android.support:customtabs:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\customtabs-26.1.0.aar\78ea4e04f2d72c3230b074a393d99a66\AndroidManifest.xml:23:9-25:38
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-media-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-media-compat-26.1.0.aar\7cc17bb116427addf591c202ad871fe5\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-fragment:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-fragment-26.1.0.aar\962af637afdd4e00760d1245cf749e0a\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-utils:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-utils-26.1.0.aar\394ab674673bc6eaa534a616089a38a2\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-ui:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-core-ui-26.1.0.aar\c0580ea5f93e29083f74952f0a86b611\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-compat:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-compat-26.1.0.aar\e080a91ff3113e746e38a442e66c9a83\AndroidManifest.xml:26:9-28:38
ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:23:9-25:38
MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/7f6904797d97f90b26d5b2e089611917/AndroidManifest.xml:23:9-25:38
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ef1ac4c6ae609a360ee0f28a0f75bb14/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/baed94e7a5fb135aa8b31946815dfbe8/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/93b3a6f58fbc99ec81855ce1a4f30f85/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/2925200056b0dc0fa3f8acd4d6a71c4e/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:26:9-28:38
MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/3755c07159852d0529030aba18d6157c/AndroidManifest.xml:26:9-28:38
android:value
ADDED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:28:13-35
ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:28:13-35
android:name
ADDED from [com.android.support:support-v4:26.1.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-26.1.0.aar\2f24b40945af7ca69bc974e1daf26de3\AndroidManifest.xml:27:13-51
ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/70a507bdce25edd4f0ef8847c2b6cf5a/AndroidManifest.xml:27:13-51
meta-data#android.arch.lifecycle.VERSION
ADDED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:25:9-27:47
ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:25:9-27:47
android:value
ADDED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:27:13-44
ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:27:13-44
android:name
ADDED from [android.arch.lifecycle:runtime:1.0.0] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\runtime-1.0.0.aar\182a11de4456c69512bee6547b8d5ce7\AndroidManifest.xml:26:13-58
ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/09648047c90badc0b0127ce878e489ef/AndroidManifest.xml:26:13-58

1
app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
View File

@ -8,6 +8,7 @@ import android.content.res.Configuration;
import android.graphics.Typeface;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.Window;
import android.view.WindowManager;
import android.widget.RelativeLayout;

15
app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java
View File

@ -2,8 +2,8 @@ package de.frajul.endlessroll.main;
import android.content.Context;
import android.opengl.GLSurfaceView;
import android.view.MotionEvent;
import de.frajul.endlessroll.rendering.Rendering;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;
/**
@ -13,20 +13,21 @@ public class MyGlSurfaceView extends GLSurfaceView {
private GameRenderer renderer;
public MyGlSurfaceView(Context context, GameRenderer gameRenderer) throws Exception {
public MyGlSurfaceView(Context context, GameRenderer gameRenderer) {
super(context);
this.renderer = gameRenderer;
super.setEGLContextClientVersion(2);
super.setRenderer(renderer);
}
public void addRendering(Rendering rendering) {
renderer.addRendering(rendering);
public GameRenderer getRenderer() {
return renderer;
}
public void setCurrentRendering(Rendering currentRendering) {
super.setOnTouchListener(currentRendering);
renderer.setCurrentRendering(currentRendering);
@Override
public boolean onTouchEvent(MotionEvent event) {
renderer.getCurrentRendering().onTouch(event.getX(), event.getY());
return true;
}
@Override

33
app/src/main/java/de/frajul/endlessroll/main/game/Game.java
View File

@ -1,8 +1,5 @@
package de.frajul.endlessroll.main.game;
import android.view.MotionEvent;
import android.view.View;
import java.util.ArrayList;
import java.util.List;
@ -32,6 +29,7 @@ import de.frajul.endlessroll.main.physics.Physics;
import de.frajul.endlessroll.main.screens.GameScreen;
import de.frajul.endlessroll.main.screens.Screen;
import de.frajul.endlessroll.rendering.Rendering;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;
import de.frajul.endlessroll.sqlDatabase.MyDatabase;
import de.frajul.endlessroll.views.ViewManager;
@ -61,8 +59,8 @@ public class Game extends Rendering<GameScene> {
private List<Integer> collectedStars = new ArrayList<>();
private boolean energyCollected;
public Game(GameHandler handler, GameScreen gameScreen, GameActivity gameActivity) throws Exception {
super(gameActivity);
public Game(GameHandler handler, GameScreen gameScreen, GameActivity gameActivity, GameRenderer gameRenderer) throws Exception {
super(gameActivity, gameRenderer);
this.handler = handler;
this.gameActivity = gameActivity;
physics = new Physics();
@ -131,15 +129,10 @@ public class Game extends Rendering<GameScene> {
gameState = GameState.RUNNING;
}
@Override
public void setScreenSize(int width, int height) {
Vector screenSize = new Vector(width, height);
scene.setScreenSize(screenSize);
}
@Override
public void update() {
try {
GameLog.i("FrameTimeMilliseconds: " + timer.getFrameTimeMilliseconds());
particleSystem.update(timer);
if (scene == null || player == null)
return;
@ -175,10 +168,10 @@ public class Game extends Rendering<GameScene> {
}
@Override
public boolean onTouch(View v, MotionEvent event) {
public void onTouch(float x, float y) {
try {
if (gameState == GameState.RUNNING && event.getAction() == MotionEvent.ACTION_DOWN) {
Vector touchPoint = scene.calcWorldFromScreenCoords(event.getX(), event.getY());
if (gameState == GameState.RUNNING) {
Vector touchPoint = scene.calcWorldFromScreenCoords(x, y);
for (ToolButton toolButton : toolButtonBar.getToolButtons()) {
ToolType toolType = toolButton.getToolType();
@ -186,7 +179,7 @@ public class Game extends Rendering<GameScene> {
toolButton.getBorder()) && toolType != null) {
toolButtonBar.setActive(toolType);
setCurrentTool(toolType, toolButton.hasFinishedLoading());
return true;
return;
}
}
touchPoint.translate(scene.camera.getX(), scene.camera.getY());
@ -196,26 +189,23 @@ public class Game extends Rendering<GameScene> {
if (currentTool == ToolType.BOMB) {
Obstacle selectedObstacle = scene.getObstacleAtPoint(touchPoint);
if (selectedObstacle == null) {
viewManager.showBombErrorMessage(event.getX(), event.getY());
return true;
viewManager.showBombErrorMessage(x, y);
return;
} else {
currentToolButton.setProgress(0);
scene.getBombSelected().set(false);
Tool tool = addTool(touchPoint);
if (tool != null && tool instanceof Bomb)
((Bomb) tool).setAttachedObstacle(selectedObstacle);
return true;
return;
}
}
currentToolButton.setProgress(0);
addTool(touchPoint);
return true;
}
}
return false;
} catch (Exception e) {
onException(e);
return false;
}
}
@ -370,7 +360,6 @@ public class Game extends Rendering<GameScene> {
}
}
@Override
public void onException(Exception e) {
handler.onException(e);
}

19
app/src/main/java/de/frajul/endlessroll/main/game/Scene.java
View File

@ -5,6 +5,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.AnimatedEntity;
@ -23,7 +24,6 @@ import de.frajul.endlessroll.entities.tileLists.Terrain;
import de.frajul.endlessroll.entities.tools.Tool;
import de.frajul.endlessroll.levels.worlds.World;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.GameLog;
/**
* Created by Julian on 20.07.2016.
@ -36,8 +36,8 @@ public abstract class Scene {
private GameActivity gameActivity;
protected Camera camera;
private Vector screenSize;
private Entity playerArrow;
private AtomicInteger screenWidth, screenHeight;
protected ParticleSystem particleSystem;
protected TexturePack textures;
@ -66,6 +66,8 @@ public abstract class Scene {
ceiling = new Ceiling(World.GRASSLANDS.getTerrainTexture());
player = new Player();
bombSelected = new AtomicBoolean(false);
screenWidth = new AtomicInteger();
screenHeight = new AtomicInteger();
}
public void setTexturePack(TexturePack texturePack) {
@ -153,16 +155,17 @@ public abstract class Scene {
}
protected Vector calcWorldFromScreenCoords(float screenX, float screenY) throws Exception {
if (screenSize == null)
if (screenWidth.get() == 0 || screenHeight.get() == 0)
throw new Exception("ScreenSize not set");
float glCoordWidth = (2f * screenSize.x / screenSize.y);
float x = ((screenX / screenSize.x) * 2f - 1f) * glCoordWidth / 2;
float y = -((screenY / screenSize.y) * 2f - 1f);
float glCoordWidth = (2f * screenWidth.get() / (float) screenHeight.get());
float x = ((screenX / (float) screenWidth.get()) * 2f - 1f) * glCoordWidth / 2;
float y = -((screenY / (float) screenHeight.get()) * 2f - 1f);
return new Vector(x, y);
}
public void setScreenSize(Vector screenSize) {
this.screenSize = screenSize;
public void setScreenSize(int width, int height) {
this.screenWidth.set(width);
this.screenHeight.set(height);
}
public synchronized Background getBackground() {

5
app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
View File

@ -5,17 +5,18 @@ import android.view.ViewGroup;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.MyGlSurfaceView;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;
/**
* Created by Julian on 30.07.2016.
*/
public abstract class GLScreen<V extends ViewGroup> extends Screen<V> {
protected MyGlSurfaceView glView;
protected GameRenderer gameRenderer;
public GLScreen(ScreenType type, GameActivity gameActivity, @LayoutRes int layoutId, MyGlSurfaceView glView) {
super(type, gameActivity, layoutId);
this.glView = glView;
this.gameRenderer = glView.getRenderer();
}
}

5
app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java
View File

@ -17,15 +17,14 @@ public class GLTestScreen extends GLScreen<RelativeLayout> {
public GLTestScreen(GameActivity gameActivity, MyGlSurfaceView glView) throws Exception{
super(ScreenType.GL_TEST, gameActivity, R.layout.gl_test_screen, glView);
rendering = new TestScreenRendering(gameActivity);
glView.addRendering(rendering);
rendering = new TestScreenRendering(gameActivity, gameRenderer);
}
@Override
public void prepareToBeShown() {
gameActivity.getSoundManager().menuMusic.start();
glView.setCurrentRendering(rendering);
gameRenderer.setCurrentRendering(rendering);
}
@Override

7
app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
View File

@ -24,15 +24,14 @@ public class GameScreen extends GLScreen<RelativeLayout> {
public GameScreen(GameActivity gameActivity, MyGlSurfaceView glSurfaceView) throws Exception {
super(ScreenType.GAME, gameActivity, R.layout.game, glSurfaceView);
game = new Game(gameViewHandler, this, gameActivity);
glView.addRendering(game);
game = new Game(gameViewHandler, this, gameActivity, gameRenderer);
}
@Override
public void prepareToBeShown() {
gameActivity.getSoundManager().menuMusic.stop();
glView.setCurrentRendering(game);
gameRenderer.setCurrentRendering(game);
game.getViewManager().prepareToBeShown();
}
@ -77,7 +76,7 @@ public class GameScreen extends GLScreen<RelativeLayout> {
@Override
public void toScreen(ScreenType screen) {
glView.setCurrentRendering(null);
gameRenderer.setCurrentRendering(null);
gameActivity.flipToScreen(screen);
}

7
app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
View File

@ -45,8 +45,7 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
confirmDialog = new ConfirmDialog(gameActivity, this);
rendering = new StartScreenRendering(gameActivity);
glView.addRendering(rendering);
rendering = new StartScreenRendering(gameActivity, gameRenderer);
}
private Button createButton(@IdRes int id, Typeface typeface) {
@ -62,7 +61,7 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
((StartScene) rendering.getScene()).randomizeWorld();
((StartScene) rendering.getScene()).loadTexturesForCurrentWorld();
glView.setCurrentRendering(rendering);
gameRenderer.setCurrentRendering(rendering);
}
@Override
@ -74,7 +73,7 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
public void onClick(View v) {
if (v.equals(play)) {
gameActivity.flipToScreen(ScreenType.WORLDS);
glView.setCurrentRendering(null);
gameRenderer.setCurrentRendering(null);
} else if (v.equals(gain90EP)) {
gameActivity.getUser().gainEp(90, true);
} else if (v.equals(unlockLevels)) {

9
app/src/main/java/de/frajul/endlessroll/main/screens/StartScreenRendering.java
View File

@ -10,6 +10,7 @@ import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.StartScene;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.rendering.Rendering;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;
/**
* Created by Julian on 20.07.2016.
@ -20,8 +21,8 @@ public class StartScreenRendering extends Rendering<StartScene> {
private Timer timer;
private ParticleSystem particleSystem;
public StartScreenRendering(GameActivity gameActivity) throws Exception {
super(gameActivity);
public StartScreenRendering(GameActivity gameActivity, GameRenderer gameRenderer) throws Exception {
super(gameActivity, gameRenderer);
this.gameActivity = gameActivity;
this.particleSystem = new ParticleSystem(gameActivity);
}
@ -49,8 +50,6 @@ public class StartScreenRendering extends Rendering<StartScene> {
}
@Override
public boolean onTouch(View v, MotionEvent event) {
return false;
public void onTouch(float x, float y) {
}
}

8
app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java
View File

@ -10,6 +10,7 @@ import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.TestScreenScene;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.rendering.Rendering;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;
/**
* Created by Julian on 20.07.2016.
@ -20,8 +21,8 @@ public class TestScreenRendering extends Rendering<TestScreenScene> {
private Timer timer;
private ParticleSystem particleSystem;
public TestScreenRendering(GameActivity gameActivity) throws Exception{
super(gameActivity);
public TestScreenRendering(GameActivity gameActivity, GameRenderer gameRenderer) throws Exception{
super(gameActivity, gameRenderer);
this.gameActivity = gameActivity;
particleSystem = new ParticleSystem(gameActivity);
}
@ -51,8 +52,7 @@ public class TestScreenRendering extends Rendering<TestScreenScene> {
}
@Override
public boolean onTouch(View v, MotionEvent event) {
return false;
public void onTouch(float x, float y) {
}
}

2
app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java
View File

@ -58,7 +58,7 @@ public class TutorialView implements View.OnClickListener {
int imageId = breakPoints.get(currentBreakPoint).getImageId();
if (textId == -1)
textView.setVisibility(View.INVISIBLE);
textView.setVisibility(View.GONE);
else {
textView.setVisibility(View.VISIBLE);
textView.setText(textId);

13
app/src/main/java/de/frajul/endlessroll/rendering/Rendering.java
View File

@ -3,23 +3,24 @@ package de.frajul.endlessroll.rendering;
import android.content.Context;
import android.view.View;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.game.Scene;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;
/**
* Created by Julian on 26.11.2015.
*/
public abstract class Rendering<S extends Scene> implements View.OnTouchListener {
public abstract class Rendering<S extends Scene> {
protected S scene;
private GameActivity gameActivity;
private boolean alreadyInitiated = false;
public Rendering(GameActivity gameActivity) {
public Rendering(GameActivity gameActivity, GameRenderer gameRenderer) {
this.gameActivity = gameActivity;
gameRenderer.addRenderTarget(this);
}
public void initiate(TexturePack texturePack, Timer timer) {
@ -31,13 +32,11 @@ public abstract class Rendering<S extends Scene> implements View.OnTouchListener
public abstract void update();
public void onException(Exception e) {
gameActivity.onException(e);
}
public abstract void onTouch(float x, float y);
public void setScreenSize(int width, int height) {
if (scene != null)
scene.setScreenSize(new Vector(width, height));
scene.setScreenSize(width, height);
}
public Scene getScene() {

25
app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java
View File

@ -50,7 +50,6 @@ public class GameRenderer implements GLSurfaceView.Renderer {
private TerrainShader terrainShader;
private SimpleShader simpleShader;
private GuiShader guiShader;
private TexturePack texturePack;
private Timer timer;
@ -61,14 +60,18 @@ public class GameRenderer implements GLSurfaceView.Renderer {
particleRenderer = new ParticleRenderer(activity, quad, matrixCreator);
}
public void addRendering(Rendering rendering) {
renderTargets.add(rendering);
public void addRenderTarget(Rendering renderTarget){
renderTargets.add(renderTarget);
}
public synchronized void setCurrentRendering(Rendering currentRendering) {
public void setCurrentRendering(Rendering currentRendering) {
this.currentRendering = currentRendering;
}
public Rendering getCurrentRendering() {
return currentRendering;
}
@Override
public void onSurfaceCreated(GL10 gl, EGLConfig config) {
GameLog.d("onSurfaceCreated");
@ -77,7 +80,7 @@ public class GameRenderer implements GLSurfaceView.Renderer {
gl.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
try {
particleRenderer.createContext();
particleRenderer.createShader();
entityShader = new EntityShader(activity);
obstacleShader = new ObstacleShader(activity);
terrainShader = new TerrainShader(activity);
@ -86,12 +89,10 @@ public class GameRenderer implements GLSurfaceView.Renderer {
texturePack = new TexturePack(activity);
timer = new Timer();
} catch (Exception e) {
for (Rendering rendering : renderTargets)
rendering.onException(e);
}
for (Rendering rendering : renderTargets) {
rendering.initiate(texturePack, timer);
activity.onException(e);
}
for(Rendering renderTarget : renderTargets)
renderTarget.initiate(texturePack, timer);
}
@Override
@ -100,8 +101,8 @@ public class GameRenderer implements GLSurfaceView.Renderer {
particleRenderer.createFbo(width, height);
GLES20.glViewport(0, 0, width, height);
matrixCreator.setMVPMSize(width, height);
for (Rendering rendering : renderTargets)
rendering.setScreenSize(width, height);
for(Rendering renderTarget : renderTargets)
renderTarget.setScreenSize(width, height);
activity.onSurfaceChanged();
}

2
app/src/main/java/de/frajul/endlessroll/rendering/renderer/ParticleRenderer.java
View File

@ -33,7 +33,7 @@ public class ParticleRenderer {
this.matrixCreator = matrixCreator;
}
public void createContext() throws Exception {
public void createShader() throws Exception {
particleShader = new ParticleShader(context);
}

2
app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java
View File

@ -47,7 +47,7 @@ public class GoalMessageLevelButton implements View.OnClickListener {
}
public void setVisible(boolean visible) {
layout.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
layout.setVisibility(visible ? View.VISIBLE : View.GONE);
}
public void init(@StringRes int textId, Level level) {

2
app/src/main/java/de/frajul/endlessroll/views/ShortMenu.java
View File

@ -63,7 +63,7 @@ public class ShortMenu implements View.OnClickListener {
}
public void setVisible(boolean visible) {
layout.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
layout.setVisibility(visible ? View.VISIBLE : View.GONE);
if (visible)
topBar.update();
}

10
app/src/main/res/layout/game.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false">
android:layout_height="match_parent">
<ImageView
android:id="@+id/game_pausebutton"
@ -19,6 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:text="@string/game_playerprogress_placeholder"
android:textColor="@color/secondary"
@ -42,7 +42,7 @@
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"/>
android:visibility="gone"/>
<include
android:id="@+id/game_game_over_message"
@ -51,7 +51,7 @@
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"/>
android:visibility="gone"/>
<include
android:id="@+id/game_goal_message"
@ -60,6 +60,6 @@
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"/>
android:visibility="gone"/>
</RelativeLayout>

4
app/src/main/res/layout/topbar.xml
View File

@ -132,7 +132,7 @@
android:layout_centerVertical="true"
android:text="@string/placeholder_number"
android:textSize="20sp"
android:visibility="invisible"/>
android:visibility="gone"/>
<TextView
android:id="@+id/topbar_energycount_decrease"
@ -143,5 +143,5 @@
android:layout_centerVertical="true"
android:text="@string/placeholder_number"
android:textSize="20sp"
android:visibility="invisible"/>
android:visibility="gone"/>
</RelativeLayout>

30
particlelab/particlelab.iml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":particlelab" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":particlelab" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/Julian/AndroidStudioProjects/EndlessRoll" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@ -49,13 +49,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" 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/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
@ -63,6 +56,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<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/testDebug/shaders" 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" />
@ -70,13 +70,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<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" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<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" />
@ -84,6 +77,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<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" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />