Bump dependency versions

* Anvil 2.5.0-beta09 * androidx-activity 1.9.0 * androidx-fragment 1.7.0 * assertk 0.28.1 * compose 1.6.7 * compose-compiler 1.5.13 Downgrade AGP to 8.2.2 so that the project can be openend in Intellij IDEA
illarionov · May 13, 2024 · 6e5c313 · 6e5c313
1 parent d8fbc4a
commit 6e5c313
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/...in/kotlin/ru/pixnews/anvil/codegen/activity/generator/ContributesActivityCodeGenerator.kt b/...in/kotlin/ru/pixnews/anvil/codegen/activity/generator/ContributesActivityCodeGenerator.kt
@@ -15,7 +15,7 @@ import com.squareup.anvil.compiler.internal.buildFile
 import com.squareup.anvil.compiler.internal.reference.ClassReference
 import com.squareup.anvil.compiler.internal.reference.asClassName
 import com.squareup.anvil.compiler.internal.reference.classAndInnerClassReferences
-import com.squareup.anvil.compiler.internal.reference.generateClassName
+import com.squareup.anvil.compiler.internal.reference.joinSimpleNames
 import com.squareup.anvil.compiler.internal.safePackageString
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
@@ -56,7 +56,7 @@ public class ContributesActivityCodeGenerator : CodeGenerator {
     ): GeneratedFileWithSources {
         annotatedClass.checkClassExtendsType(ANDROID_ACTIVITY_FQ_NAME)
 
-        val moduleClassId = annotatedClass.generateClassName(suffix = "_ActivityModule")
+        val moduleClassId = annotatedClass.joinSimpleNames(suffix = "_ActivityModule")
         val generatedPackage = moduleClassId.packageFqName.safePackageString()
         val moduleClassName = moduleClassId.relativeClassName.asString()
 

diff --git a/...otlin/ru/pixnews/anvil/codegen/experiment/generator/ContributesExperimentCodeGenerator.kt b/...otlin/ru/pixnews/anvil/codegen/experiment/generator/ContributesExperimentCodeGenerator.kt
@@ -15,7 +15,7 @@ import com.squareup.anvil.compiler.internal.buildFile
 import com.squareup.anvil.compiler.internal.reference.ClassReference
 import com.squareup.anvil.compiler.internal.reference.asClassName
 import com.squareup.anvil.compiler.internal.reference.classAndInnerClassReferences
-import com.squareup.anvil.compiler.internal.reference.generateClassName
+import com.squareup.anvil.compiler.internal.reference.joinSimpleNames
 import com.squareup.anvil.compiler.internal.safePackageString
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.FileSpec
@@ -62,7 +62,7 @@ public class ContributesExperimentCodeGenerator : CodeGenerator {
         annotatedClasses: Collection<ClassReference.Psi>,
         codeGenDir: File,
     ): GeneratedFileWithSources {
-        val moduleClassId = annotatedClasses.first().generateClassName(suffix = "_Experiments_Module")
+        val moduleClassId = annotatedClasses.first().joinSimpleNames(suffix = "_Experiments_Module")
         val generatedPackage = moduleClassId.packageFqName.safePackageString()
         val moduleClassName = moduleClassId.relativeClassName.asString()
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,17 +4,17 @@ androidCompileSdk = "34"
 
 kotlin = "1.9.23"
 
-agp = "8.3.2"
-androidx-activity = "1.8.2"
+agp = "8.2.2"
+androidx-activity = "1.9.0"
 androidx-annotation = "1.7.1"
-androidx-fragment = "1.6.2"
+androidx-fragment = "1.7.0"
 androidx-lifecycle = "2.7.0"
 androidx-workmanager = "2.9.0"
-anvil = "2.5.0-beta05"
+anvil = "2.5.0-beta09"
 auto-service = "1.1.1"
-assertk = "0.28.0"
-compose = "1.6.3"
-composeCompiler = "1.5.11"
+assertk = "0.28.1"
+compose = "1.6.7"
+composeCompiler = "1.5.13"
 detekt = "1.23.6"
 dagger = "2.51.1"
 diktat = "2.0.0"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -61,7 +61,12 @@
          <trusted-key id="90EE19787A7BCF6FD37A1E9180C08B1C29100955" group="com.squareup.retrofit2"/>
          <trusted-key id="95115197C5227C0887299D000F9FE62F88E938D8" group="com.google.dagger"/>
          <trusted-key id="A5BD02B93E7A40482EB1D66A5F69AD087600B22C" group="org.ow2.asm"/>
-         <trusted-key id="A5F483CD733A4EBAEA378B2AE88979FB9B30ACF2" group="^androidx[.]compose($|([.].*))" regex="true"/>
+         <trusted-key id="A5F483CD733A4EBAEA378B2AE88979FB9B30ACF2">
+            <trusting group="androidx.activity"/>
+            <trusting group="androidx.core"/>
+            <trusting group="androidx.fragment"/>
+            <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
+         </trusted-key>
          <trusted-key id="ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB" group="com.pinterest.ktlint"/>
          <trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD" group="io.grpc"/>
          <trusted-key id="BDB5FA4FE719D787FB3D3197F6D4A1D411E9D1AE" group="com.google.guava"/>

diff --git a/...lin/ru/pixnews/anvil/codegen/initializer/generator/ContributesInitializerCodeGenerator.kt b/...lin/ru/pixnews/anvil/codegen/initializer/generator/ContributesInitializerCodeGenerator.kt
@@ -19,7 +19,7 @@ import com.squareup.anvil.compiler.internal.reference.allSuperTypeClassReference
 import com.squareup.anvil.compiler.internal.reference.asClassName
 import com.squareup.anvil.compiler.internal.reference.asTypeName
 import com.squareup.anvil.compiler.internal.reference.classAndInnerClassReferences
-import com.squareup.anvil.compiler.internal.reference.generateClassName
+import com.squareup.anvil.compiler.internal.reference.joinSimpleNames
 import com.squareup.anvil.compiler.internal.safePackageString
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec
@@ -132,5 +132,5 @@ public class ContributesInitializerCodeGenerator : CodeGenerator {
 
     private fun ClassReference.isInitializer() = getInitializerBoundType() != null
 
-    private fun ClassReference.moduleNameForInitializer(): ClassId = generateClassName(suffix = "_InitializerModule")
+    private fun ClassReference.moduleNameForInitializer(): ClassId = joinSimpleNames(suffix = "_InitializerModule")
 }
diff --git a/...r/src/main/kotlin/ru/pixnews/anvil/codegen/test/generator/ContributesTestCodeGenerator.kt b/...r/src/main/kotlin/ru/pixnews/anvil/codegen/test/generator/ContributesTestCodeGenerator.kt
@@ -15,7 +15,7 @@ import com.squareup.anvil.compiler.internal.buildFile
 import com.squareup.anvil.compiler.internal.reference.ClassReference
 import com.squareup.anvil.compiler.internal.reference.asClassName
 import com.squareup.anvil.compiler.internal.reference.classAndInnerClassReferences
-import com.squareup.anvil.compiler.internal.reference.generateClassName
+import com.squareup.anvil.compiler.internal.reference.joinSimpleNames
 import com.squareup.anvil.compiler.internal.safePackageString
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.FileSpec
@@ -49,7 +49,7 @@ public class ContributesTestCodeGenerator : CodeGenerator {
         annotatedClass: ClassReference,
         codeGenDir: File,
     ): GeneratedFileWithSources {
-        val moduleClassId = annotatedClass.generateClassName(suffix = "_TestModule")
+        val moduleClassId = annotatedClass.joinSimpleNames(suffix = "_TestModule")
         val generatedPackage = moduleClassId.packageFqName.safePackageString()
         val moduleClassName = moduleClassId.relativeClassName.asString()
 

diff --git a/.../kotlin/ru/pixnews/anvil/codegen/viewmodel/generator/ContributesViewModelCodeGenerator.kt b/.../kotlin/ru/pixnews/anvil/codegen/viewmodel/generator/ContributesViewModelCodeGenerator.kt
@@ -16,7 +16,7 @@ import com.squareup.anvil.compiler.internal.reference.ClassReference
 import com.squareup.anvil.compiler.internal.reference.MemberFunctionReference
 import com.squareup.anvil.compiler.internal.reference.asClassName
 import com.squareup.anvil.compiler.internal.reference.classAndInnerClassReferences
-import com.squareup.anvil.compiler.internal.reference.generateClassName
+import com.squareup.anvil.compiler.internal.reference.joinSimpleNames
 import com.squareup.anvil.compiler.internal.safePackageString
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
@@ -56,7 +56,7 @@ public class ContributesViewModelCodeGenerator : CodeGenerator {
     ): GeneratedFileWithSources {
         annotatedClass.checkClassExtendsType(VIEW_MODEL_FQ_NAME)
 
-        val moduleClassId = annotatedClass.generateClassName(suffix = "_FactoryModule")
+        val moduleClassId = annotatedClass.joinSimpleNames(suffix = "_FactoryModule")
         val generatedPackage = moduleClassId.packageFqName.safePackageString()
         val moduleClassName = moduleClassId.relativeClassName.asString()
 

diff --git a/...ru/pixnews/anvil/codegen/workmanager/generator/ContributesCoroutineWorkerCodeGenerator.kt b/...ru/pixnews/anvil/codegen/workmanager/generator/ContributesCoroutineWorkerCodeGenerator.kt
@@ -15,7 +15,7 @@ import com.squareup.anvil.compiler.internal.buildFile
 import com.squareup.anvil.compiler.internal.reference.ClassReference
 import com.squareup.anvil.compiler.internal.reference.asClassName
 import com.squareup.anvil.compiler.internal.reference.classAndInnerClassReferences
-import com.squareup.anvil.compiler.internal.reference.generateClassName
+import com.squareup.anvil.compiler.internal.reference.joinSimpleNames
 import com.squareup.anvil.compiler.internal.safePackageString
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
@@ -57,7 +57,7 @@ public class ContributesCoroutineWorkerCodeGenerator : CodeGenerator {
         annotatedClass.checkClassExtendsType(COROUTINE_WORKER_FQ_NAME)
 
         val workerClassName = annotatedClass.asClassName()
-        val factoryClassId = annotatedClass.generateClassName(suffix = "_AssistedFactory")
+        val factoryClassId = annotatedClass.joinSimpleNames(suffix = "_AssistedFactory")
         val generatedPackage = factoryClassId.packageFqName.safePackageString()
         val factoryClassName = factoryClassId.relativeClassName.asString()