Skip to content

Commit f5b18f9

Browse files
wslanywslany
authored
Merge pull request #825 from Catrobat/release-2.6.1
Release 2.6.1
2 parents e1bb81c + cdbf5ef commit f5b18f9

File tree

65 files changed

+1879
-513
lines changed

Some content is hidden

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

65 files changed

+1879
-513
lines changed

‎Jenkinsfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pipeline {
4343
additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
4444
// Ensure that each executor has its own gradle cache to not affect other builds
4545
// that run concurrently.
46-
args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
46+
args '--device /dev/kvm:/dev/kvm -m=6.5G'
4747
label useDebugLabelParameter('LimitedEmulator')
4848
}
4949
}
@@ -63,7 +63,6 @@ pipeline {
6363
stage('Build Debug-APK') {
6464
steps {
6565
sh "./gradlew -Pindependent='#$env.BUILD_NUMBER $env.BRANCH_NAME' assembleDebug"
66-
renameApks("${env.BRANCH_NAME}-${env.BUILD_NUMBER}")
6766
archiveArtifacts 'app/build/outputs/apk/debug/paintroid-debug*.apk'
6867
plot csvFileName: 'dexcount.csv', csvSeries: [[displayTableFlag: false, exclusionValues: '', file: 'Paintroid/build/outputs/dexcount/*.csv', inclusionFlag: 'OFF', url: '']], group: 'APK Stats', numBuilds: '180', style: 'line', title: 'dexcount'
6968
}

‎Jenkinsfile.releaseAPK‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
1616
// Ensure that each executor has its own gradle cache to not affect other builds
1717
// that run concurrently.
18-
args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle'
18+
args '--device /dev/kvm:/dev/kvm'
1919
}
2020
}
2121

@@ -68,6 +68,7 @@ pipeline {
6868
}
6969
}
7070
archiveArtifacts artifacts: 'app/build/outputs/apk/signedRelease/paintroid-signedRelease.apk', fingerprint: true
71+
archiveArtifacts artifacts: 'app/build/outputs/mapping/signedRelease/mapping.txt', fingerprint: true
7172
}
7273
}
7374

‎Paintroid/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ dependencies {
117117

118118
implementation 'androidx.core:core-ktx:1.3.2'
119119
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
120+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
121+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
120122

121123
debugImplementation 'androidx.multidex:multidex:2.0.0'
122124

‎Paintroid/gradle/code_quality_tasks.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
task checkstyle(type: Checkstyle) {
2121
configFile file('config/checkstyle.xml')
2222
source '.'
23-
include '**/*.java', '**/*.xml', '**/*.gradle'
23+
include '**/*.java', '**/*.kt', '**/*.xml', '**/*.gradle'
2424
exclude '**/gen/**', '**/build/**', 'libraryProjects/**', '**/.idea/**'
2525

2626
classpath = files()

‎Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LandscapeIntegrationTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.catrobat.paintroid.tools.ToolType;
3333
import org.catrobat.paintroid.tools.options.ToolOptionsViewController;
3434
import org.junit.Before;
35+
import org.junit.Ignore;
3536
import org.junit.Rule;
3637
import org.junit.Test;
3738
import org.junit.runner.RunWith;
@@ -204,6 +205,7 @@ public void testCorrectSelectionInBothOrientationsLineTool() {
204205
assertEquals(toolType, getCurrentTool().getToolType());
205206
}
206207

208+
@Ignore("Fail due to Pipette")
207209
@Test
208210
public void testCorrectSelectionInBothOrientationsPipetteTool() {
209211
ToolType toolType = ToolType.PIPETTE;
@@ -451,6 +453,7 @@ public void testIfCurrentToolIsShownInBottomNavigation() {
451453
if (toolType == ToolType.IMPORTPNG
452454
|| toolType == ToolType.COLORCHOOSER
453455
|| toolType == ToolType.REDO
456+
|| toolType == ToolType.PIPETTE
454457
|| toolType == ToolType.UNDO
455458
|| toolType == ToolType.LAYER) {
456459
continue;

‎Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerIntegrationTest.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Paintroid: An image manipulation application for Android.
3-
* Copyright (C) 2010-2015 The Catrobat Team
3+
* Copyright (C) 2010-2021 The Catrobat Team
44
* (<http://developer.catrobat.org/credits>)
55
*
66
* This program is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@
2929
import org.catrobat.paintroid.tools.Workspace;
3030
import org.junit.Before;
3131
import org.junit.ClassRule;
32+
import org.junit.Ignore;
3233
import org.junit.Rule;
3334
import org.junit.Test;
3435
import org.junit.runner.RunWith;
@@ -59,6 +60,7 @@
5960

6061
@RunWith(AndroidJUnit4.class)
6162
public class LayerIntegrationTest {
63+
6264
@Rule
6365
public ActivityTestRule<MainActivity> launchActivityRule = new ActivityTestRule<>(MainActivity.class);
6466

@@ -209,6 +211,7 @@ public void testDeleteEmptyLayer() {
209211
.checkLayerCount(1);
210212
}
211213

214+
@Ignore("Fail due to Pipette")
212215
@Test
213216
public void testDeleteFilledLayer() {
214217
onLayerMenuView()
@@ -262,6 +265,7 @@ public void testTryDeleteOnlyLayer() {
262265
.checkLayerCount(1);
263266
}
264267

268+
@Ignore("Fail due to Pipette")
265269
@Test
266270
public void testSwitchBetweenFilledLayers() {
267271
onToolBarView()
@@ -303,6 +307,7 @@ public void testSwitchBetweenFilledLayers() {
303307
.checkMatchesColor(Color.WHITE);
304308
}
305309

310+
@Ignore("Fail due to Pipette")
306311
@Test
307312
public void testMultipleLayersNewImageDiscardOld() {
308313
onDrawingSurfaceView()
@@ -333,6 +338,7 @@ public void testMultipleLayersNewImageDiscardOld() {
333338
.checkLayerCount(1);
334339
}
335340

341+
@Ignore("Fail due to Pipette")
336342
@Test
337343
public void testMultipleLayersNewImageSaveOld() {
338344
onDrawingSurfaceView()
@@ -450,6 +456,7 @@ public void testResizingThroughAllLayers() {
450456
.checkThatLayerDimensions(lessThan(bitmapWidth), lessThan(bitmapHeight));
451457
}
452458

459+
@Ignore("Fail due to Pipette")
453460
@Test
454461
public void testRotatingThroughAllLayers() {
455462
onLayerMenuView()
@@ -501,6 +508,7 @@ public void testRotatingThroughAllLayers() {
501508
.checkMatchesColor(Color.BLACK);
502509
}
503510

511+
@Ignore("Fail due to Pipette")
504512
@Test
505513
public void testReflectingOnlyCurrentLayer() {
506514
onDrawingSurfaceView()
@@ -563,6 +571,7 @@ public void testUndoRedoLayerDelete() {
563571
.checkLayerCount(1);
564572
}
565573

574+
@Ignore("Fail due to Pipette")
566575
@Test
567576
public void testLayerOrderUndoDelete() {
568577
onToolBarView()

‎Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/MenuFileActivityIntegrationTest.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Paintroid: An image manipulation application for Android.
3-
* Copyright (C) 2010-2015 The Catrobat Team
3+
* Copyright (C) 2010-2021 The Catrobat Team
44
* (<http://developer.catrobat.org/credits>)
55
*
66
* This program is free software: you can redistribute it and/or modify
@@ -348,15 +348,15 @@ public void testSaveCopy() {
348348

349349
onView(withText(R.string.save_button_text)).perform(click());
350350

351-
onView(withText(R.string.pocketpaint_no)).perform(click());
352-
onView(withText(R.string.pocketpaint_ok)).perform(click());
353-
354351
assertNotNull(activity.model.getSavedPictureUri());
355352

356353
addUriToDeletionFileList(activity.model.getSavedPictureUri());
357354

358355
File oldFile = new File(activity.model.getSavedPictureUri().toString());
359356

357+
onView(withText(R.string.pocketpaint_no)).perform(click());
358+
onView(withText(R.string.pocketpaint_ok)).perform(click());
359+
360360
onDrawingSurfaceView()
361361
.perform(touchAt(DrawingSurfaceLocationProvider.HALFWAY_BOTTOM_MIDDLE));
362362

@@ -384,6 +384,10 @@ public void testAskForSaveAfterSavedOnce() {
384384
.performOpenMoreOptions();
385385

386386
onView(withText(R.string.menu_save_image)).perform(click());
387+
388+
onView(withId(R.id.pocketpaint_image_name_save_text))
389+
.perform(replaceText("AskForSaveAfterSavedOnce"));
390+
387391
onView(withText(R.string.save_button_text)).perform(click());
388392

389393
assertNotNull(activity.model.getSavedPictureUri());
@@ -518,6 +522,9 @@ public void testCheckSaveFileWithDifferentFormats() {
518522
onView(withId(R.id.pocketpaint_image_name_save_text))
519523
.perform(replaceText(Constants.TEMP_PICTURE_NAME));
520524

525+
onView(withText(R.string.save_button_text))
526+
.perform(click());
527+
521528
assertNotNull(activity.model.getSavedPictureUri());
522529
addUriToDeletionFileList(activity.model.getSavedPictureUri());
523530

0 commit comments

Comments
 (0)