Skip to content

Commit 9a6b40b

Browse files
authored
Rollback Ktlint update (#6865)
Task/Issue URL: https://app.asana.com/1/137249556945/project/488551667048375/task/1211506961789626?focus=true ### Description - Rolls back to ktlint 0.50.0, the last version I saw working without issue prior to Ktlint 1.0 and addition of new rules. We were using `0.47.1` with Kotlinter prior to the move to Spotless - Apply a one off formatting to the codebase to prevent others needing to make the changes incrementally. - We still ratchetFrom develop to make doubly sure that when this goes in that if anything, people still only format files they touch. But that should be minimal. ### Steps to test this PR Apply patch ``` Index: code-formatting.gradle IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/code-formatting.gradle b/code-formatting.gradle --- a/code-formatting.gradle (revision b355a47) +++ b/code-formatting.gradle (date 1759319873227) @@ -1,7 +1,6 @@ apply plugin: 'com.diffplug.spotless' spotless { - ratchetFrom 'origin/develop' kotlin { target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt' ktlint("0.50.0") ``` - [x] Checkout the branch - [x] Run `.gradlew spotlessCheck`. You _might_ need to add --no-daemon so that Spotless picks up the .editorConfig changes. Let me know if you do. - [x] Make some code edits (re-order imports, move java packages up for instance) - [x] Run `.gradlew spotlessApply` - [x] Formatting should be applied ### UI changes N/A
1 parent 14be2ac commit 9a6b40b

File tree

1,243 files changed

+2160
-2189
lines changed

Some content is hidden

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

1,243 files changed

+2160
-2189
lines changed

.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ij_kotlin_field_annotation_wrap = normal
4545
ij_kotlin_finally_on_new_line = false
4646
ij_kotlin_if_rparen_on_new_line = true
4747
ij_kotlin_import_nested_classes = true
48-
ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
48+
ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^
4949
ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
5050
ij_kotlin_keep_blank_lines_before_right_brace = 0
5151
ij_kotlin_keep_blank_lines_in_code = 1
@@ -95,3 +95,4 @@ ktlint_standard_no-wildcard-imports = disabled
9595
ktlint_standard_filename = disabled
9696
ktlint_standard_package-name = disabled
9797
ktlint_standard_annotation = disabled
98+
ktlint_standard_kdoc-wrapping = disabled

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DataRemovalAdClickWorker.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
3030
import com.duckduckgo.common.utils.DispatcherProvider
3131
import com.duckduckgo.di.scopes.AppScope
3232
import com.squareup.anvil.annotations.ContributesMultibinding
33-
import java.util.concurrent.TimeUnit
34-
import javax.inject.Inject
3533
import kotlinx.coroutines.withContext
3634
import logcat.LogPriority.VERBOSE
3735
import logcat.logcat
36+
import java.util.concurrent.TimeUnit
37+
import javax.inject.Inject
3838

3939
@ContributesWorker(AppScope::class)
4040
class DataRemovalAdClickWorker(context: Context, workerParameters: WorkerParameters) :

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import com.duckduckgo.adclick.impl.store.exemptions.AdClickExemptionsDao
2121
import com.duckduckgo.adclick.impl.store.exemptions.AdClickExemptionsDatabase
2222
import com.duckduckgo.adclick.impl.store.exemptions.AdClickTabExemptionEntity
2323
import com.duckduckgo.common.utils.DispatcherProvider
24-
import java.util.concurrent.ConcurrentHashMap
2524
import kotlinx.coroutines.CoroutineScope
2625
import kotlinx.coroutines.launch
2726
import logcat.logcat
27+
import java.util.concurrent.ConcurrentHashMap
2828

2929
interface AdClickData {
3030

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import com.duckduckgo.app.browser.UriString
2323
import com.duckduckgo.di.scopes.AppScope
2424
import com.squareup.anvil.annotations.ContributesBinding
2525
import dagger.SingleInstanceIn
26-
import javax.inject.Inject
2726
import logcat.logcat
2827
import okhttp3.internal.publicsuffix.PublicSuffixDatabase
28+
import javax.inject.Inject
2929

3030
@SingleInstanceIn(AppScope::class)
3131
@ContributesBinding(AppScope::class)

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/pixels/AdClickDailyReportingWorker.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
2929
import com.duckduckgo.common.utils.DispatcherProvider
3030
import com.duckduckgo.di.scopes.AppScope
3131
import com.squareup.anvil.annotations.ContributesMultibinding
32-
import java.util.concurrent.TimeUnit
33-
import javax.inject.Inject
3432
import kotlinx.coroutines.withContext
3533
import logcat.LogPriority.VERBOSE
3634
import logcat.logcat
35+
import java.util.concurrent.TimeUnit
36+
import javax.inject.Inject
3737

3838
@ContributesWorker(AppScope::class)
3939
class AdClickDailyReportingWorker(context: Context, workerParameters: WorkerParameters) :

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/remoteconfig/AdClickAttributionFeature.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import com.duckduckgo.di.scopes.AppScope
2121
import com.duckduckgo.feature.toggles.api.Toggle
2222
import com.duckduckgo.feature.toggles.api.Toggle.DefaultFeatureValue
2323

24+
/**
25+
* This is the class that represents the adClickAttribution feature flags.
26+
*/
2427
@ContributesRemoteFeature(
2528
scope = AppScope::class,
2629
featureName = "adClickAttribution",
2730
settingsStore = AdClickAttributionFeatureSettingsStore::class,
2831
)
29-
/**
30-
* This is the class that represents the adClickAttribution feature flags.
31-
*/
3232
interface AdClickAttributionFeature {
3333
/**
3434
* @return `true` when the remote config has the global "adClickAttribution" feature flag enabled

ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/remoteconfig/AdClickAttributionRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import com.duckduckgo.adclick.impl.store.AdClickAttributionLinkFormatEntity
2323
import com.duckduckgo.adclick.impl.store.AdClickDao
2424
import com.duckduckgo.adclick.impl.store.AdClickDatabase
2525
import com.duckduckgo.common.utils.DispatcherProvider
26-
import java.util.concurrent.CopyOnWriteArrayList
2726
import kotlinx.coroutines.CoroutineScope
2827
import kotlinx.coroutines.launch
28+
import java.util.concurrent.CopyOnWriteArrayList
2929

3030
interface AdClickAttributionRepository {
3131
fun updateAll(

ad-click/ad-click-impl/src/test/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickDataTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.duckduckgo.adclick.impl.store.exemptions.AdClickExemptionsDao
2121
import com.duckduckgo.adclick.impl.store.exemptions.AdClickExemptionsDatabase
2222
import com.duckduckgo.common.test.CoroutineTestRule
2323
import com.duckduckgo.feature.toggles.api.Toggle
24-
import java.util.concurrent.TimeUnit
2524
import kotlinx.coroutines.test.TestScope
2625
import org.junit.Assert.assertEquals
2726
import org.junit.Assert.assertFalse
@@ -35,6 +34,7 @@ import org.mockito.kotlin.never
3534
import org.mockito.kotlin.reset
3635
import org.mockito.kotlin.verify
3736
import org.mockito.kotlin.whenever
37+
import java.util.concurrent.TimeUnit
3838

3939
class DuckDuckGoAdClickDataTest {
4040

ad-click/ad-click-impl/src/test/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManagerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
2020
import com.duckduckgo.adclick.api.AdClickManager
2121
import com.duckduckgo.adclick.impl.pixels.AdClickPixelName
2222
import com.duckduckgo.adclick.impl.pixels.AdClickPixels
23-
import java.util.concurrent.TimeUnit
2423
import org.junit.Assert.assertFalse
2524
import org.junit.Assert.assertTrue
2625
import org.junit.Before
@@ -33,6 +32,7 @@ import org.mockito.kotlin.times
3332
import org.mockito.kotlin.verify
3433
import org.mockito.kotlin.verifyNoInteractions
3534
import org.mockito.kotlin.whenever
35+
import java.util.concurrent.TimeUnit
3636

3737
@RunWith(AndroidJUnit4::class)
3838
class DuckDuckGoAdClickManagerTest {

ad-click/ad-click-impl/src/test/java/com/duckduckgo/adclick/impl/pixels/RealAdClickPixelsTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ import com.duckduckgo.adclick.impl.Exemption
2424
import com.duckduckgo.app.statistics.pixels.Pixel
2525
import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Count
2626
import com.duckduckgo.common.test.api.InMemorySharedPreferences
27-
import java.time.Instant
28-
import java.util.concurrent.TimeUnit
2927
import org.junit.Assert.assertEquals
3028
import org.junit.Assert.assertFalse
3129
import org.junit.Assert.assertTrue
@@ -38,6 +36,8 @@ import org.mockito.kotlin.mock
3836
import org.mockito.kotlin.never
3937
import org.mockito.kotlin.verify
4038
import org.mockito.kotlin.whenever
39+
import java.time.Instant
40+
import java.util.concurrent.TimeUnit
4141

4242
@RunWith(AndroidJUnit4::class)
4343
class RealAdClickPixelsTest {

0 commit comments

Comments
 (0)