Merge branch 'release/5.55.0'

Author: marcosholgado

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
+apply from: "$rootDir/ktlint.gradle"
 
 ext {
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false

app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt

@@ -50,4 +50,4 @@ class CoroutineTestRule(val testDispatcher: TestCoroutineDispatcher = TestCorout
 @ExperimentalCoroutinesApi
 fun CoroutineTestRule.runBlocking(block: suspend () -> Unit) = this.testDispatcher.runBlockingTest {
     block()
-}
+}

app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt

@@ -26,4 +26,4 @@ object FileUtilities {
         return javaClass.classLoader!!.getResource(resourceName).openStream().bufferedReader()
     }
 
-}
+}

app/src/androidTest/java/com/duckduckgo/app/InstantSchedulersRule.kt

@@ -16,15 +16,13 @@
 
 package com.duckduckgo.app
 
-
 import io.reactivex.android.plugins.RxAndroidPlugins
 import io.reactivex.plugins.RxJavaPlugins
 import io.reactivex.schedulers.Schedulers
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
 
-
 class InstantSchedulersRule : TestRule {
 
     override fun apply(base: Statement, description: Description): Statement {
@@ -53,4 +51,4 @@ class InstantSchedulersRule : TestRule {
         }
     }
 
-}
+}

app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt

@@ -19,7 +19,6 @@ package com.duckduckgo.app
 import com.duckduckgo.app.di.DaggerTestAppComponent
 import com.duckduckgo.app.global.DuckDuckGoApplication
 
-
 class TestApplication : DuckDuckGoApplication() {
 
     /**
@@ -34,4 +33,4 @@ class TestApplication : DuckDuckGoApplication() {
             .build()
         daggerAppComponent.inject(this)
     }
-}
+}

app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt

@@ -44,4 +44,4 @@ fun getApp(): TestApplication {
 
 fun getDaggerComponent(): TestAppComponent {
     return getApp().daggerAppComponent as TestAppComponent
-}
+}

app/src/androidTest/java/com/duckduckgo/app/TestRunner.kt

@@ -20,10 +20,9 @@ import android.app.Application
 import android.content.Context
 import androidx.test.runner.AndroidJUnitRunner
 
-
 @Suppress("unused")
 class TestRunner : AndroidJUnitRunner() {
     override fun newApplication(cl: ClassLoader, className: String, context: Context): Application {
         return super.newApplication(cl, TestApplication::class.java.name, context)
     }
-}
+}

app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt

@@ -75,4 +75,4 @@ class AutoCompleteApiTest {
 
         assertSame("https://example.com", value.suggestions[0].phrase)
     }
-}
+}

app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt

@@ -92,4 +92,4 @@ class BookmarksDaoTest {
         assertFalse(dao.hasBookmarks())
     }
 
-}
+}

app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt

@@ -101,4 +101,4 @@ class BookmarksViewModelTest {
         assertNotNull(captor.value)
         assertNotNull(captor.value.bookmarks)
     }
-}
+}