Skip to content

Use version catalog for appcheck deps #6567

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

Merged
merged 2 commits into from
Dec 6, 2024
Merged

Use version catalog for appcheck deps #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7934df2
Use version catalog for appcheck deps
rlazo Dec 6, 2024
458d920
Merge branch 'main' into rl.version.catalog.appcheck
rlazo Dec 6, 2024
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
17 changes: 8 additions & 9 deletions appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,29 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api project(':appcheck:firebase-appcheck')
api project(':appcheck:firebase-appcheck-debug')
api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation libs.androidx.test.core
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.playservices.base
implementation libs.playservices.tasks

testImplementation project(':appcheck:firebase-appcheck-playintegrity')
testImplementation libs.androidx.test.core
testImplementation libs.truth
testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric

androidTestImplementation project(':firebase-storage')
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation libs.androidx.test.runner
androidTestImplementation libs.androidx.test.junit
androidTestImplementation libs.truth
androidTestImplementation 'junit:junit:4.13-beta-2'
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
androidTestImplementation libs.junit
androidTestImplementation libs.mockito.core
}
13 changes: 6 additions & 7 deletions appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,24 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.playservices.base
implementation libs.playservices.tasks

testImplementation(project(":integ-testing")){
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
testImplementation libs.androidx.test.core
testImplementation 'androidx.test:rules:1.2.0'
testImplementation libs.androidx.test.rules
testImplementation libs.truth
testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric
}
10 changes: 5 additions & 5 deletions appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ android {
}

dependencies {
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.playservices.base
implementation libs.playservices.tasks

testImplementation libs.androidx.test.core
testImplementation 'androidx.test:rules:1.2.0'
testImplementation libs.androidx.test.rules
testImplementation libs.truth
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric
}
10 changes: 5 additions & 5 deletions appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation 'com.google.android.play:integrity:1.2.0'
implementation libs.playservices.base
implementation libs.playservices.tasks
implementation libs.integrity

testImplementation(project(":integ-testing")){
exclude group: 'com.google.firebase', module: 'firebase-common'
Expand All @@ -66,6 +66,6 @@ dependencies {
testImplementation libs.androidx.test.core
testImplementation libs.truth
testImplementation libs.junit
testImplementation 'org.mockito:mockito-core:3.4.6'
testImplementation libs.mockito.core
testImplementation libs.robolectric
}
23 changes: 11 additions & 12 deletions appcheck/firebase-appcheck/firebase-appcheck.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,15 @@ android {
}

dependencies {
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
javadocClasspath libs.autovalue.annotations

api libs.playservices.tasks
api 'com.google.firebase:firebase-annotations:16.2.0'
api "com.google.firebase:firebase-appcheck-interop:17.1.0"
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")

implementation 'androidx.annotation:annotation:1.1.0'
implementation libs.androidx.annotation
implementation libs.playservices.base
implementation libs.kotlin.stdlib

Expand All @@ -66,25 +65,25 @@ dependencies {
exclude group: 'com.google.firebase', module: 'firebase-components'
}
testImplementation libs.androidx.test.core
testImplementation 'androidx.test:rules:1.2.0'
testImplementation libs.androidx.test.rules
testImplementation libs.truth
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13-beta-2'
testImplementation libs.junit
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation 'org.mockito:mockito-inline:5.2.0'
testImplementation libs.mockito.mockito.inline
testImplementation libs.robolectric

androidTestImplementation project(':appcheck:firebase-appcheck')
androidTestImplementation(project(":integ-testing")){
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
androidTestImplementation "androidx.annotation:annotation:1.0.0"
androidTestImplementation libs.androidx.annotation
androidTestImplementation libs.androidx.test.core
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation libs.androidx.test.runner
androidTestImplementation libs.androidx.test.junit
androidTestImplementation libs.truth
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
androidTestImplementation libs.junit
androidTestImplementation libs.mockito.core
androidTestImplementation libs.mockito.mockito.inline
}
8 changes: 4 additions & 4 deletions appcheck/firebase-appcheck/ktx/ktx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ dependencies {
implementation("com.google.firebase:firebase-components:18.0.0")

testImplementation libs.truth
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.25.0'
testImplementation libs.junit
testImplementation libs.mockito.core
testImplementation libs.robolectric

androidTestImplementation libs.androidx.test.core
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation libs.androidx.test.runner
androidTestImplementation 'com.google.firebase:firebase-appcheck-interop:17.1.0'
androidTestImplementation libs.truth
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation libs.junit
}
4 changes: 4 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ firebaseCommon = "21.0.0"
firebaseComponents = "18.0.0"
grpc = "1.62.2"
grpcKotlin = "1.4.1"
integrity = "1.2.0"
javalite = "3.25.5"
kotlin = "1.8.22"
mavenResolverApi = "1.9.22"
mavenResolverProvider = "3.9.9"
mockitoInlineVersion = "2.25.0"
mockk = "1.13.11"
serialization-plugin = "1.8.22"
protoc = "3.25.5"
Expand Down Expand Up @@ -60,6 +62,7 @@ grpc-testing = { module= "io.grpc:grpc-testing", version.ref="grpc" }
grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" }
grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpcKotlin" }
grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
integrity = { module = "com.google.android.play:integrity", version.ref = "integrity" }
javax-annotation-jsr250 = { module = "javax.annotation:jsr250-api", version = "1.0" }
javax-inject = { module = "javax.inject:javax.inject", version = "1" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
Expand All @@ -77,6 +80,7 @@ maven-resolver-provider = { module = "org.apache.maven:maven-resolver-provider",
maven-resolver-transport-file = { module = "org.apache.maven.resolver:maven-resolver-transport-file", version.ref = "mavenResolverApi" }
maven-resolver-transport-http = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "mavenResolverApi" }
maven-resolver-util = { module = "org.apache.maven.resolver:maven-resolver-util", version.ref = "mavenResolverApi" }
mockito-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInlineVersion" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
org-json = { module = "org.json:json", version = "20210307" }
playservices-base = { module = "com.google.android.gms:play-services-base", version = "18.1.0" }
Expand Down
Loading