[WIP] Update to Kotlin 2.1.21

.editorconfig

@@ -91,3 +91,7 @@ ij_kotlin_while_on_new_line = false
 ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 1
 ij_kotlin_wrap_first_method_in_call_chain = false
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_filename = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_annotation = disabled

.githooks/pre-commit

@@ -2,6 +2,5 @@
     #!/bin/bash
     echo "Running spotless check"
     ./gradlew spotlessApply
-    ./gradlew formatKotlin
     git add `git diff --name-only --cached`
     exit 0

.github/workflows/ci.yml

         run: cat build/fladle/fladleResults/HtmlErrorReport.html | cut -d\`  -f2 >> results.json 
 runs-on: android-large-runner 
 runs-on: android-large-runner 
 runs-on: android-large-runner 
 run: echo $FLANK > flank.json 
         run: cat build/fladle/fladleResults/HtmlErrorReport.html | cut -d\`  -f2 >> results.json 
@@ -27,6 +27,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0 # required due to setting Spotless ratchetFrom
           submodules: recursive
 
       - name: Set up JDK version
@@ -39,7 +40,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Run Code Formatting Checks
-        run: ./gradlew code_format_checks
+        run: ./gradlew spotlessCheck
 
   unit_tests:
     name: Unit tests

.github/workflows/nightly.yml

 run: cat build/fladle/fladleResults/HtmlErrorReport.html | cut -d\`  -f2 >> results.json 
 run: echo $FLANK > flank.json 
 run: cat build/fladle/fladleResults/HtmlErrorReport.html | cut -d\`  -f2 >> results.json 
@@ -18,6 +18,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0 # required due to setting Spotless ratchetFrom
           submodules: recursive
 
       - name: Set up JDK version
@@ -30,7 +31,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: Run Code Formatting Checks
-        run: ./gradlew code_format_checks
+        run: ./gradlew spotlessCheck
 
   unit_tests:
     name: Unit tests

.gitignore

@@ -41,9 +41,10 @@ captures/
 
 # Intellij
 *.iml
-.idea/
-.idea/workspace.xml
+.idea/*
 !.idea/icon.svg
+!.idea/copyright/
+.idea/workspace.xml
 
 # Keystore files
 *.jks

CONTRIBUTING.md

@@ -50,6 +50,5 @@ If your PR is failing because of that, please make sure that you follow our [sty
 You can also trigger an automatic code formatting of the code by executing:
 
 ```
-./gradleW code_format_checks
-./gradleW formatKotlin
+./gradleW app:spotlessApply
 ```

STYLEGUIDE.md

@@ -5,8 +5,8 @@
 
 ###  Code formatting
 
-You can check the code formatting correctness by running `./gradleW code_format_checks`.
-To adhere to codestyle, please run `./gradleW formatKotlin` and `./gradleW spotlessApply` to autoformat in order to fix any CI issues.
+You can check the code formatting correctness by running `./gradleW spotlessCheck`.
+To adhere to codestyle, please run `./gradleW spotlessApply` to autoformat and fix any CI issues.
 
 If you want to do this automatically upon commit we recommend the existing [pre-commit hook](.githooks/pre-commit):
 - Pull develop branch

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributeToActivityStarterCodeGenerator.kt

@@ -40,7 +40,7 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator {
 
     override fun isApplicable(context: AnvilContext): Boolean = true
 
-    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
+    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
         return projectFiles.classAndInnerClassReferences(module)
             .toList()
             .filter { it.isAnnotatedWith(ContributeToActivityStarter::class.fqName) }
@@ -52,7 +52,7 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator {
             .toList()
     }
 
-    private fun generateParameterToActivityMapper(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateParameterToActivityMapper(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val moduleClassName = "${vmClass.shortName}_ActivityMapper"
 
@@ -73,7 +73,7 @@ class ContributeToActivityStarterCodeGenerator : CodeGenerator {
             }
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun createMapperClass(

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesPluginPointCodeGenerator.kt

@@ -45,7 +45,7 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
 
     override fun isApplicable(context: AnvilContext): Boolean = true
 
-    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
+    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
         return projectFiles.classAndInnerClassReferences(module)
             .toList()
             .filter { it.isAnnotatedWith(ContributesPluginPoint::class.fqName) }
@@ -58,7 +58,7 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
             .toList()
     }
 
-    private fun generatePluginPoint(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generatePluginPoint(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val pluginPointClassName = "${vmClass.shortName}_PluginPoint"
         val scope = vmClass.annotations.first { it.fqName == ContributesPluginPoint::class.fqName }.scopeOrNull(0)!!
@@ -132,10 +132,10 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
             )
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, pluginPointClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, pluginPointClassName, content, vmClass.containingFileAsJavaFile)
     }
 
-    private fun generateBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val moduleClassName = "${vmClass.shortName}_PluginPoint_Module"
         val scope = vmClass.annotations.first { it.fqName == ContributesPluginPoint::class.fqName }.scopeOrNull(0)!!
@@ -180,7 +180,7 @@ class ContributesPluginPointCodeGenerator : CodeGenerator {
             ).build()
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     companion object {

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesRemoteFeatureCodeGenerator.kt

@@ -51,7 +51,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
         codeGenDir: File,
         module: ModuleDescriptor,
         projectFiles: Collection<KtFile>,
-    ): Collection<GeneratedFile> {
+    ): Collection<GeneratedFileWithSources> {
         return projectFiles.classAndInnerClassReferences(module)
             .toList()
             .filter { it.isAnnotatedWith(ContributesRemoteFeature::class.fqName) }
@@ -72,7 +72,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
         codeGenDir: File,
         module: ModuleDescriptor,
         customStorePresence: CustomStorePresence,
-    ): GeneratedFile {
+    ): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val generatedClassName = "${vmClass.shortName}_ProxyModule"
         val annotation = vmClass.annotations.first { it.fqName == ContributesRemoteFeature::class.fqName }
@@ -187,15 +187,15 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
             )
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun generateRemoteFeature(
         vmClass: ClassReference.Psi,
         codeGenDir: File,
         module: ModuleDescriptor,
         customStorePresence: CustomStorePresence,
-    ): GeneratedFile {
+    ): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val generatedClassName = "${vmClass.shortName}_RemoteFeature"
         val annotation = vmClass.annotations.first { it.fqName == ContributesRemoteFeature::class.fqName }
@@ -319,7 +319,7 @@ class ContributesRemoteFeatureCodeGenerator : CodeGenerator {
             )
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, generatedClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun generateOptionalBindings(

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesServiceApiCodeGenerator.kt

@@ -46,7 +46,7 @@ class ContributesServiceApiCodeGenerator : CodeGenerator {
 
     override fun isApplicable(context: AnvilContext): Boolean = true
 
-    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
+    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
         return projectFiles.classAndInnerClassReferences(module)
             .toList()
             .filter { reference -> reference.isAnnotatedWith(serviceApiAnnotations.map { it.fqName }) }
@@ -58,7 +58,7 @@ class ContributesServiceApiCodeGenerator : CodeGenerator {
             .toList()
     }
 
-    private fun generateServiceApiModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateServiceApiModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val moduleClassName = "${vmClass.shortName}_Module"
 
@@ -125,7 +125,7 @@ class ContributesServiceApiCodeGenerator : CodeGenerator {
             ).build()
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun ClassReference.Psi.serviceApiClassName(

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesSubComponentCodeGenerator.kt

@@ -50,7 +50,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
 
     override fun isApplicable(context: AnvilContext): Boolean = true
 
-    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
+    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
         return projectFiles.classAndInnerClassReferences(module)
             .toList()
             .filter { it.isAnnotatedWith(InjectWith::class.fqName) }
@@ -69,7 +69,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
             .toList()
     }
 
-    private fun generateActivityInjector(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateActivityInjector(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val activityInjectorInterfaceName = "${vmClass.shortName}_Injector"
         val scope = vmClass.annotations.first { it.fqName == InjectWith::class.fqName }.scopeOrNull(0)!!
@@ -105,9 +105,9 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
             ).build()
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, activityInjectorInterfaceName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, activityInjectorInterfaceName, content, vmClass.containingFileAsJavaFile)
     }
-    private fun generateSubcomponentFactory(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateSubcomponentFactory(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val subcomponentFactoryClassName = vmClass.subComponentName()
         val scope = vmClass.annotations.first { it.fqName == InjectWith::class.fqName }.scopeOrNull(0)!!
@@ -159,7 +159,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
             ).build()
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, subcomponentFactoryClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, subcomponentFactoryClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun generateParentComponentInterface(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): TypeSpec {
@@ -184,7 +184,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
             .build()
     }
 
-    private fun generateSubcomponentFactoryBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateSubcomponentFactoryBindingModule(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val moduleClassName = "${vmClass.subComponentName()}_Module"
         val scope = vmClass.annotations.first { it.fqName == InjectWith::class.fqName }.scopeOrNull(0)!!
@@ -219,7 +219,7 @@ class ContributesSubComponentCodeGenerator : CodeGenerator {
             ).build()
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, moduleClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun FqName.subComponentAnnotation(module: ModuleDescriptor, delayGeneration: Boolean): AnnotationSpec {

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesViewModelCodeGenerator.kt

@@ -42,7 +42,7 @@ class ContributesViewModelCodeGenerator : CodeGenerator {
 
     override fun isApplicable(context: AnvilContext): Boolean = true
 
-    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFile> {
+    override fun generateCode(codeGenDir: File, module: ModuleDescriptor, projectFiles: Collection<KtFile>): Collection<GeneratedFileWithSources> {
         return projectFiles.classAndInnerClassReferences(module)
             .toList()
             .filter { it.isAnnotatedWith(ContributesViewModel::class.fqName) }
@@ -52,7 +52,7 @@ class ContributesViewModelCodeGenerator : CodeGenerator {
             .toList()
     }
 
-    private fun generateFactoryPlugin(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFile {
+    private fun generateFactoryPlugin(vmClass: ClassReference.Psi, codeGenDir: File, module: ModuleDescriptor): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val factoryClassName = "${vmClass.shortName}_ViewModelFactory"
         val scope = vmClass.annotations.first { it.fqName == ContributesViewModel::class.fqName }.scopeOrNull(0)
@@ -122,7 +122,7 @@ class ContributesViewModelCodeGenerator : CodeGenerator {
             ).build()
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, factoryClassName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, factoryClassName, content, vmClass.containingFileAsJavaFile)
     }
 
     companion object {

anvil/anvil-compiler/src/main/java/com/duckduckgo/anvil/compiler/ContributesWorkerCodeGenerator.kt

@@ -23,6 +23,7 @@ import com.squareup.anvil.annotations.ExperimentalAnvilApi
 import com.squareup.anvil.compiler.api.AnvilContext
 import com.squareup.anvil.compiler.api.CodeGenerator
 import com.squareup.anvil.compiler.api.GeneratedFile
+import com.squareup.anvil.compiler.api.GeneratedFileWithSources
 import com.squareup.anvil.compiler.api.createGeneratedFile
 import com.squareup.anvil.compiler.internal.asClassName
 import com.squareup.anvil.compiler.internal.buildFile
@@ -59,7 +60,7 @@ class ContributesWorkerCodeGenerator : CodeGenerator {
         codeGenDir: File,
         module: ModuleDescriptor,
         projectFiles: Collection<KtFile>,
-    ): Collection<GeneratedFile> = projectFiles.classAndInnerClassReferences(module)
+    ): Collection<GeneratedFileWithSources> = projectFiles.classAndInnerClassReferences(module)
         .toList()
         .filter { it.isAnnotatedWith(ContributesWorker::class.fqName) }
         .flatMap {
@@ -71,7 +72,7 @@ class ContributesWorkerCodeGenerator : CodeGenerator {
         vmClass: ClassReference.Psi,
         codeGenDir: File,
         module: ModuleDescriptor,
-    ): GeneratedFile {
+    ): GeneratedFileWithSources {
         val generatedPackage = vmClass.packageFqName.toString()
         val workerPluginName = "${vmClass.shortName}_WorkerInjectorPlugin"
         val scope = vmClass.annotations.first { it.fqName == ContributesWorker::class.fqName }.scopeOrNull(0)
@@ -125,7 +126,7 @@ class ContributesWorkerCodeGenerator : CodeGenerator {
             )
         }
 
-        return createGeneratedFile(codeGenDir, generatedPackage, workerPluginName, content)
+        return createGeneratedFile(codeGenDir, generatedPackage, workerPluginName, content, vmClass.containingFileAsJavaFile)
     }
 
     private fun generateCode(

app-tracking-protection/vpn-impl/src/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.duckduckgo.mobile.android.vpn.ui.report.DeviceShieldAppTrackersInfo"
+            android:name="com.duckduckgo.mobile.android.vpn.ui.privacyreport.DeviceShieldAppTrackersInfo"
             android:exported="false"
             android:label="@string/atp_ProfilingActivityTitle"
             android:parentActivityName="com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivity"