PAINTROID-786 Update Gradle Plugin to 8.9.1

Author: foenabua

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
 
     agent {
          docker {
-            image 'catrobat/catrobat-paintroid:stable'
+            image 'floriankanduth/paintroid_java17:latest'
             args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
             label 'LimitedEmulator'
             alwaysPull true
@@ -114,6 +114,7 @@ pipeline {
 
                 stage('Device Tests') {
                     steps {
+                        sh "sdkmanager 'emulator'"
                         sh "echo no | avdmanager create avd --force --name android28 --package 'system-images;android-28;default;x86_64'"
                         sh "/home/user/android/sdk/emulator/emulator -no-window -no-boot-anim -noaudio -avd android28 > /dev/null 2>&1 &"
                         sh './gradlew -PenableCoverage -Pjenkins -Pemulator=android28 -Pci createDebugCoverageReport -i'

Paintroid/build.gradle

@@ -18,7 +18,7 @@
  */
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.hiya.jacoco-android'
+apply plugin: "com.mxalbert.gradle.jacoco-android"
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'kotlin-android'
 apply plugin: 'org.catrobat.gradle.androidemulators'
@@ -51,14 +51,14 @@ emulators {
 }
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.10"
 }
 
 jacocoAndroidUnitTestReport {
-    csv.enabled false
-    html.enabled true
-    xml.enabled true
-    destination project.getBuildDir().getPath() + "/reports/jacoco/jacocoTestDebugUnitTestReport"
+    csv.required = false
+    html.required = true
+    xml.required = true
+    destination = project.getBuildDir().getPath() + "/reports/jacoco/jacocoTestDebugUnitTestReport"
 }
 
 android {
@@ -68,8 +68,6 @@ android {
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        versionCode rootProject.ext.androidVersionCode
-        versionName rootProject.ext.androidVersionName
     }
 
     compileOptions {
@@ -85,36 +83,39 @@ android {
         signedRelease {
         }
         debug {
-            testCoverageEnabled = project.hasProperty('enableCoverage')
+            enableUnitTestCoverage = 'project.hasProperty(\'enableCoverage\')'
+            enableAndroidTestCoverage = 'project.hasProperty(\'enableCoverage\')'
             // Multidex is required as espresso and mockito/bytebuddy are adding more functions
             // than should be allowed by law.
             // See https://github.com/mockito/mockito/issues/1112
             multiDexEnabled true
         }
     }
 
-    lintOptions {
-        // specific ignores should be defined via lint.xml file
-        lintConfig file('config/lint.xml')
-        ignore 'ClickableViewAccessibility', 'StaticFieldLeak', 'GradleDependency', 'OldTargetApi', 'LintBaseline'
-        textReport true
-        xmlReport true
-        htmlReport true
-        xmlOutput file("build/reports/lint-report.xml")
-        htmlOutput file("build/reports/lint-report.html")
-    }
-
     testOptions {
         unitTests.returnDefaultValues = true
         animationsDisabled = true
     }
-
     packagingOptions {
         resources {
             excludes += ['META-INF/AL2.0', 'META-INF/LGPL2.1', "**/attach_hotspot_windows.dll"]
             merges += ['META-INF/licenses/ASM']
         }
     }
+
+    namespace 'org.catrobat.paintroid'
+    lint {
+        htmlOutput file('build/reports/lint-report.html')
+        htmlReport true
+        ignore 'ClickableViewAccessibility', 'StaticFieldLeak', 'GradleDependency', 'OldTargetApi', 'LintBaseline'
+        lintConfig file('config/lint.xml')
+        textReport true
+        xmlOutput file('build/reports/lint-report.xml')
+        xmlReport true
+    }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -137,16 +138,15 @@ dependencies {
     implementation 'com.jraska:falcon:2.2.0'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.18.3'
+    testImplementation 'org.mockito:mockito-core:3.6.28'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
 
     androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestImplementation 'org.mockito:mockito-android:3.6.28'
+    androidTestImplementation 'org.mockito:mockito-android:5.15.2'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
     androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'

Paintroid/gradle/code_quality_tasks.gradle

@@ -34,7 +34,7 @@ dependencies {
     detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.20.0"
 }
 
-task checkstyle(type: Checkstyle) {
+tasks.register('checkstyle', Checkstyle) {
     configFile file('config/checkstyle.xml')
     source '.'
     include '**/*.java', '**/*.kt', '**/*.xml', '**/*.gradle'
@@ -47,12 +47,12 @@ task checkstyle(type: Checkstyle) {
     ignoreFailures false
 
     reports {
-        xml.enabled = true
+        xml.required = true
         xml.destination file("build/reports/checkstyle.xml")
     }
 }
 
-task pmd(type: Pmd) {
+tasks.register('pmd', Pmd) {
     ruleSetFiles = files('config/pmd.xml')
     ruleSets = []
 
@@ -63,8 +63,8 @@ task pmd(type: Pmd) {
     ignoreFailures false
 
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required = true
+        html.required = true
         xml.destination file("build/reports/pmd.xml")
     }
 }

Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/api/CorrectStandbyBucketBehaviourTests.kt

@@ -4,17 +4,17 @@ import android.app.Activity
 import android.app.usage.UsageStatsManager
 import android.content.Context
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
 import org.catrobat.paintroid.MainActivity
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RequiresApi(api = Build.VERSION_CODES.P)
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.P)
 @RunWith(AndroidJUnit4::class)
 class CorrectStandbyBucketBehaviourTests {
 

Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/dialog/IndeterminateProgressDialogIntegrationTest.kt

@@ -22,13 +22,13 @@ import android.content.pm.ActivityInfo
 import android.content.res.Resources
 import android.graphics.PointF
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.fragment.app.DialogFragment
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
 import androidx.test.rule.ActivityTestRule
 import org.catrobat.paintroid.MainActivity
 import org.catrobat.paintroid.R
@@ -61,7 +61,7 @@ class IndeterminateProgressDialogIntegrationTest {
         dialog.dismiss()
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsShown() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -70,7 +70,7 @@ class IndeterminateProgressDialogIntegrationTest {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsNotCancelableOnBack() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -80,7 +80,7 @@ class IndeterminateProgressDialogIntegrationTest {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsNotCancelable() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -92,7 +92,7 @@ class IndeterminateProgressDialogIntegrationTest {
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
     @Test
     fun testDialogIsRotateAble() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {

Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/BrushToolIntegrationTest.kt

@@ -20,8 +20,6 @@ package org.catrobat.paintroid.test.espresso.tools
  */
 
 import android.graphics.Color
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -48,7 +46,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RequiresApi(api = Build.VERSION_CODES.P)
 @RunWith(AndroidJUnit4::class)
 class BrushToolIntegrationTest {
 

Paintroid/src/main/AndroidManifest.xml

@@ -19,7 +19,6 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.catrobat.paintroid"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>

Paintroid/src/main/java/org/catrobat/paintroid/model/LayerModel.kt

@@ -65,18 +65,14 @@ open class LayerModel : LayerContracts.Model {
 
     @Synchronized
     override fun getBitmapOfAllLayers(): Bitmap? {
-        synchronized(this) {
-            if (layers.isEmpty()) {
-                return null
-            }
-            val referenceBitmap = layers[0].bitmap
-            val bitmap = Bitmap.createBitmap(referenceBitmap.width, referenceBitmap.height, Bitmap.Config.ARGB_8888)
-            val canvas = bitmap?.let { Canvas(it) }
-
-            drawLayersOntoCanvas(canvas)
-
-            return bitmap
+        if (layers.isEmpty()) {
+            return null
         }
+        val referenceBitmap = layers[0].bitmap
+        val bitmap = Bitmap.createBitmap(referenceBitmap.width, referenceBitmap.height, Bitmap.Config.ARGB_8888)
+        val canvas = bitmap?.let { Canvas(it) }
+        drawLayersOntoCanvas(canvas)
+        return bitmap
     }
 
     override fun getBitmapListOfAllLayers(): List<Bitmap?> = layers.map { it.bitmap }

Paintroid/src/main/java/org/catrobat/paintroid/ui/BottomNavigationLandscape.kt

@@ -23,41 +23,40 @@ import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import com.google.android.material.bottomnavigation.BottomNavigationItemView
-import com.google.android.material.bottomnavigation.BottomNavigationMenuView
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.catrobat.paintroid.R
 import org.catrobat.paintroid.contract.MainActivityContracts.BottomNavigationAppearance
 import org.catrobat.paintroid.tools.ToolType
+import androidx.core.view.size
+import androidx.core.view.get
 
 class BottomNavigationLandscape(context: Context, private val bottomNavigationView: BottomNavigationView) : BottomNavigationAppearance {
-    private val bottomNavigationMenuView: BottomNavigationMenuView = bottomNavigationView.getChildAt(0) as BottomNavigationMenuView
 
     init {
         setAppearance(context)
     }
 
     override fun showCurrentTool(toolType: ToolType) {
-        val item = bottomNavigationMenuView.getChildAt(1)
-        val icon = item.findViewById<ImageView>(R.id.icon)
-        val title = item.findViewById<TextView>(R.id.title)
-        icon.setImageResource(toolType.drawableResource)
-        title.setText(toolType.nameResource)
+        val item = bottomNavigationView.menu[1]
+        item.icon = ContextCompat.getDrawable(bottomNavigationView.context, toolType.drawableResource)
+        item.title = bottomNavigationView.context.getString(toolType.nameResource)
     }
 
     private fun setAppearance(context: Context) {
         val inflater = LayoutInflater.from(context)
         val menu = bottomNavigationView.menu
-        for (i in 0 until menu.size()) {
-            val item = bottomNavigationMenuView.getChildAt(i) as BottomNavigationItemView
-            val itemBottomNavigation = inflater.inflate(R.layout.pocketpaint_layout_bottom_navigation_item, bottomNavigationMenuView, false)
+        for (i in 0 until menu.size) {
+            val item = menu[i]
+            val itemBottomNavigation = inflater.inflate(R.layout.pocketpaint_layout_bottom_navigation_item, bottomNavigationView, false)
             val icon = itemBottomNavigation.findViewById<ImageView>(R.id.icon)
             val text = itemBottomNavigation.findViewById<TextView>(R.id.title)
-            icon.setImageDrawable(menu.getItem(i).icon)
+            icon.setImageDrawable(item.icon)
             icon.setColorFilter(ContextCompat.getColor(context, R.color.pocketpaint_welcome_dot_active))
-            text.text = menu.getItem(i).title
-            item.removeAllViews()
-            item.addView(itemBottomNavigation)
+            text.text = item.title
+            if (item.actionView != null) {
+                bottomNavigationView.removeView(item.actionView)
+            }
+            item.actionView = itemBottomNavigation
         }
     }
 }

Paintroid/src/main/java/org/catrobat/paintroid/ui/viewholder/BottomNavigationViewHolder.kt

@@ -18,6 +18,7 @@
  */
 package org.catrobat.paintroid.ui.viewholder
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.graphics.Color
@@ -33,6 +34,7 @@ import org.catrobat.paintroid.tools.ToolType
 import org.catrobat.paintroid.ui.BottomNavigationLandscape
 import org.catrobat.paintroid.ui.BottomNavigationPortrait
 
+@SuppressLint("RestrictedApi")
 class BottomNavigationViewHolder(
     private val layout: View,
     private val orientation: Int,