Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependency versions #41

Merged
merged 1 commit into from
May 13, 2024
Merged

Bump dependency versions #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...in/kotlin/ru/pixnews/anvil/codegen/activity/generator/ContributesActivityCodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions ...otlin/ru/pixnews/anvil/codegen/experiment/generator/ContributesExperimentCodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions ...lin/ru/pixnews/anvil/codegen/initializer/generator/ContributesInitializerCodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
}
4 changes: 2 additions & 2 deletions ...r/src/main/kotlin/ru/pixnews/anvil/codegen/test/generator/ContributesTestCodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions .../kotlin/ru/pixnews/anvil/codegen/viewmodel/generator/ContributesViewModelCodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down
4 changes: 2 additions & 2 deletions ...ru/pixnews/anvil/codegen/workmanager/generator/ContributesCoroutineWorkerCodeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down
Loading