Skip to content

Commit 3e7e950

Browse files
sebastiangollobsebastiangollob
committed
Merge branch 'develop' into DEVOPS-837
2 parents 9b64f97 + 90b1726 commit 3e7e950

File tree

2,654 files changed

+14798
-5649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,654 files changed

+14798
-5649
lines changed

‎.run/AndroidCoverageTest.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="AndroidCoverageTest" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/catroid" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="-PenableCoverage -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.UiEspressoRtlTestSuite" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="createGoodCatroidCoverageReport" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" value="" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/Catroid [clean].run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Catroid [clean]" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="clean" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/Instrumented Unit Tests.run.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Instrumented Unit Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
3+
<module name="Catroid.catroid.androidTest" />
4+
<option name="TESTING_TYPE" value="2" />
5+
<option name="METHOD_NAME" value="" />
6+
<option name="CLASS_NAME" value="org.catrobat.catroid.testsuites.LocalHeadlessTestSuite" />
7+
<option name="PACKAGE_NAME" value="" />
8+
<option name="TEST_NAME_REGEX" value="" />
9+
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
10+
<option name="EXTRA_OPTIONS" value="" />
11+
<option name="RETENTION_ENABLED" value="No" />
12+
<option name="RETENTION_MAX_SNAPSHOTS" value="2" />
13+
<option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
14+
<option name="CLEAR_LOGCAT" value="false" />
15+
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
16+
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
17+
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
18+
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
19+
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
20+
<option name="DEBUGGER_TYPE" value="Auto" />
21+
<Auto>
22+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
23+
<option name="SHOW_STATIC_VARS" value="true" />
24+
<option name="WORKING_DIR" value="" />
25+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
26+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
27+
</Auto>
28+
<Hybrid>
29+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
30+
<option name="SHOW_STATIC_VARS" value="true" />
31+
<option name="WORKING_DIR" value="" />
32+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
33+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
34+
</Hybrid>
35+
<Java />
36+
<Native>
37+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
38+
<option name="SHOW_STATIC_VARS" value="true" />
39+
<option name="WORKING_DIR" value="" />
40+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
41+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
42+
</Native>
43+
<Profilers>
44+
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
45+
<option name="STARTUP_PROFILING_ENABLED" value="false" />
46+
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
47+
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
48+
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
49+
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
50+
<option name="PROFILING_MODE" value="NOT_SET" />
51+
</Profilers>
52+
<method v="2">
53+
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
54+
</method>
55+
</configuration>
56+
</component>

‎.run/Pull Request Suite (Gradle).run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Pull Request Suite (Gradle)" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/catroid" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="-PenableCoverage -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="connectedCatroidDebugAndroidTest" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/Pull Request Suite + JaCoCo.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Pull Request Suite + JaCoCo" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/catroid" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="-PenableCoverage -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="createCatroidDebugAndroidTestCoverageReport" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/Pull Request Suite.run.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Pull Request Suite" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
3+
<module name="Catroid.catroid.androidTest" />
4+
<option name="TESTING_TYPE" value="2" />
5+
<option name="METHOD_NAME" value="" />
6+
<option name="CLASS_NAME" value="org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite" />
7+
<option name="PACKAGE_NAME" value="" />
8+
<option name="TEST_NAME_REGEX" value="" />
9+
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
10+
<option name="EXTRA_OPTIONS" value="" />
11+
<option name="RETENTION_ENABLED" value="No" />
12+
<option name="RETENTION_MAX_SNAPSHOTS" value="2" />
13+
<option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
14+
<option name="CLEAR_LOGCAT" value="false" />
15+
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
16+
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
17+
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
18+
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
19+
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
20+
<option name="DEBUGGER_TYPE" value="Auto" />
21+
<Auto>
22+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
23+
<option name="SHOW_STATIC_VARS" value="true" />
24+
<option name="WORKING_DIR" value="" />
25+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
26+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
27+
<option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
28+
<option name="DEBUG_SANDBOX_SDK" value="false" />
29+
</Auto>
30+
<Hybrid>
31+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
32+
<option name="SHOW_STATIC_VARS" value="true" />
33+
<option name="WORKING_DIR" value="" />
34+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
35+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
36+
<option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
37+
<option name="DEBUG_SANDBOX_SDK" value="false" />
38+
</Hybrid>
39+
<Java>
40+
<option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
41+
<option name="DEBUG_SANDBOX_SDK" value="false" />
42+
</Java>
43+
<Native>
44+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
45+
<option name="SHOW_STATIC_VARS" value="true" />
46+
<option name="WORKING_DIR" value="" />
47+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
48+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
49+
<option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
50+
<option name="DEBUG_SANDBOX_SDK" value="false" />
51+
</Native>
52+
<Profilers>
53+
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
54+
<option name="STARTUP_PROFILING_ENABLED" value="false" />
55+
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
56+
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
57+
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
58+
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
59+
</Profilers>
60+
<method v="2">
61+
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
62+
</method>
63+
</configuration>
64+
</component>

‎.run/Quarantined Tests.run.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Quarantined Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
3+
<module name="Catroid.catroid.androidTest" />
4+
<option name="TESTING_TYPE" value="2" />
5+
<option name="METHOD_NAME" value="" />
6+
<option name="CLASS_NAME" value="org.catrobat.catroid.testsuites.UiEspressoQuarantineTestSuite" />
7+
<option name="PACKAGE_NAME" value="" />
8+
<option name="TEST_NAME_REGEX" value="" />
9+
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
10+
<option name="EXTRA_OPTIONS" value="" />
11+
<option name="RETENTION_ENABLED" value="No" />
12+
<option name="RETENTION_MAX_SNAPSHOTS" value="2" />
13+
<option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
14+
<option name="CLEAR_LOGCAT" value="false" />
15+
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
16+
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
17+
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
18+
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
19+
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
20+
<option name="DEBUGGER_TYPE" value="Auto" />
21+
<Auto>
22+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
23+
<option name="SHOW_STATIC_VARS" value="true" />
24+
<option name="WORKING_DIR" value="" />
25+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
26+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
27+
</Auto>
28+
<Hybrid>
29+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
30+
<option name="SHOW_STATIC_VARS" value="true" />
31+
<option name="WORKING_DIR" value="" />
32+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
33+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
34+
</Hybrid>
35+
<Java />
36+
<Native>
37+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
38+
<option name="SHOW_STATIC_VARS" value="true" />
39+
<option name="WORKING_DIR" value="" />
40+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
41+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
42+
</Native>
43+
<Profilers>
44+
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
45+
<option name="STARTUP_PROFILING_ENABLED" value="false" />
46+
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
47+
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
48+
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
49+
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
50+
<option name="PROFILING_MODE" value="NOT_SET" />
51+
</Profilers>
52+
<method v="2">
53+
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
54+
</method>
55+
</configuration>
56+
</component>

‎.run/RTL Tests.run.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="RTL Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
3+
<module name="Catroid.catroid.androidTest" />
4+
<option name="TESTING_TYPE" value="2" />
5+
<option name="METHOD_NAME" value="" />
6+
<option name="CLASS_NAME" value="org.catrobat.catroid.testsuites.UiEspressoRtlTestSuite" />
7+
<option name="PACKAGE_NAME" value="" />
8+
<option name="TEST_NAME_REGEX" value="" />
9+
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
10+
<option name="EXTRA_OPTIONS" value="" />
11+
<option name="RETENTION_ENABLED" value="No" />
12+
<option name="RETENTION_MAX_SNAPSHOTS" value="2" />
13+
<option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
14+
<option name="CLEAR_LOGCAT" value="false" />
15+
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
16+
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
17+
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
18+
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
19+
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
20+
<option name="DEBUGGER_TYPE" value="Auto" />
21+
<Auto>
22+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
23+
<option name="SHOW_STATIC_VARS" value="true" />
24+
<option name="WORKING_DIR" value="" />
25+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
26+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
27+
</Auto>
28+
<Hybrid>
29+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
30+
<option name="SHOW_STATIC_VARS" value="true" />
31+
<option name="WORKING_DIR" value="" />
32+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
33+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
34+
</Hybrid>
35+
<Java />
36+
<Native>
37+
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
38+
<option name="SHOW_STATIC_VARS" value="true" />
39+
<option name="WORKING_DIR" value="" />
40+
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
41+
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
42+
</Native>
43+
<Profilers>
44+
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
45+
<option name="STARTUP_PROFILING_ENABLED" value="false" />
46+
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
47+
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
48+
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
49+
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
50+
<option name="PROFILING_MODE" value="NOT_SET" />
51+
</Profilers>
52+
<method v="2">
53+
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
54+
</method>
55+
</configuration>
56+
</component>

‎.run/Static Code Analysis.run.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Static Code Analysis" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="clean" />
14+
<option value="detekt" />
15+
<option value="pmd" />
16+
<option value="checkstyle" />
17+
<option value="lintCatroidDebug" />
18+
</list>
19+
</option>
20+
<option name="vmOptions" value="" />
21+
</ExternalSystemSettings>
22+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
23+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
24+
<DebugAllEnabled>false</DebugAllEnabled>
25+
<RunAsTest>false</RunAsTest>
26+
<method v="2" />
27+
</configuration>
28+
</component>

0 commit comments

Comments
 (0)