Skip to content

Davidmotson.pin versions #4697

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 17 commits into from
Mar 10, 2023
Merged

Davidmotson.pin versions #4697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8df211c
replace project dependencies with pinned deps
Feb 17, 2023
021d33f
corrected overzelous script
Feb 17, 2023
52e9df0
fix tests
Feb 22, 2023
11d0b71
Merge branch 'master' into davidmotson.pin_versions
davidmotson Feb 22, 2023
64c9fe7
fix more version errors
Feb 23, 2023
e703302
revert protolite-well-known-types due to proto deps
Feb 23, 2023
bab467a
fix appdistro by un-pinning an grouped dependency
Feb 23, 2023
9183f9f
update versions for m128
Mar 3, 2023
a79eed8
revert overzealous appcheck pins
Mar 3, 2023
47dc94b
Merge branch 'master' into davidmotson.pin_versions
davidmotson Mar 3, 2023
8f9ba7d
remove javadoc classpath for storage
Mar 7, 2023
2191872
Merge branch 'master' into davidmotson.pin_versions
davidmotson Mar 8, 2023
fdf2d2f
re-pin transport runtime to fix unit test
Mar 8, 2023
a1addbe
Merge branch 'master' into davidmotson.pin_versions
davidmotson Mar 9, 2023
80ae437
Merge branch 'master' into davidmotson.pin_versions
davidmotson Mar 9, 2023
eb02621
fixes for comments
Mar 9, 2023
f782b0a
Merge branch 'master' into davidmotson.pin_versions
davidmotson Mar 9, 2023
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 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 @@ -44,8 +44,8 @@ android {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation project(':appcheck:firebase-appcheck')
implementation project(':appcheck:firebase-appcheck-debug')
implementation project(':appcheck:firebase-appcheck-interop')
Expand Down
6 changes: 3 additions & 3 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 @@ -41,9 +41,9 @@ android {
}

dependencies {
implementation project(':firebase-annotations')
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-annotations:16.2.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation project(':appcheck:firebase-appcheck')
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
4 changes: 2 additions & 2 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 @@ -42,8 +42,8 @@ android {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

Expand Down
6 changes: 3 additions & 3 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 @@ -41,9 +41,9 @@ android {
}

dependencies {
implementation project(':firebase-annotations')
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-annotations:16.2.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation project(':appcheck:firebase-appcheck')
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ android {
}

dependencies {
implementation project(':firebase-annotations')
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-annotations:16.2.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation project(':appcheck:firebase-appcheck')
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
8 changes: 4 additions & 4 deletions appcheck/firebase-appcheck/firebase-appcheck.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ android {
}

dependencies {
implementation project(':firebase-annotations')
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(":appcheck:firebase-appcheck-interop")
implementation 'com.google.firebase:firebase-annotations:16.2.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation project(':appcheck:firebase-appcheck-interop')
implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck/ktx/ktx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':firebase-common:ktx')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
implementation 'androidx.annotation:annotation:1.1.0'
implementation project(path: ':appcheck:firebase-appcheck')
implementation project(path: ':appcheck:firebase-appcheck-interop')
Expand Down
2 changes: 1 addition & 1 deletion encoders/firebase-encoders-json/firebase-encoders-json.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ android {

dependencies {
implementation 'androidx.annotation:annotation:1.1.0'
implementation project(':encoders:firebase-encoders')
implementation 'com.google.firebase:firebase-encoders:17.0.0'

testImplementation 'androidx.test:runner:1.3.0'
testImplementation 'androidx.test.ext:junit:1.1.2'
Expand Down
2 changes: 1 addition & 1 deletion encoders/firebase-encoders-processor/firebase-encoders-processor.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def jvm = org.gradle.internal.jvm.Jvm.current()


dependencies {
implementation project(':encoders:firebase-encoders')
implementation 'com.google.firebase:firebase-encoders:17.0.0'
implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
implementation 'com.squareup:javapoet:1.13.0'
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
Expand Down
2 changes: 1 addition & 1 deletion encoders/firebase-encoders-proto/firebase-encoders-proto.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protobuf {

dependencies {
implementation 'androidx.annotation:annotation:1.1.0'
implementation project(':encoders:firebase-encoders')
implementation 'com.google.firebase:firebase-encoders:17.0.0'

annotationProcessor project(':encoders:firebase-encoders-processor')

Expand Down
4 changes: 2 additions & 2 deletions encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ android {

dependencies {
implementation 'androidx.annotation:annotation:1.1.0'
implementation project(':encoders:firebase-encoders')
implementation project(':encoders:firebase-encoders-json')
implementation 'com.google.firebase:firebase-encoders:17.0.0'
implementation 'com.google.firebase:firebase-encoders-json:18.0.0'

testImplementation 'androidx.test:runner:1.3.0'
testImplementation 'androidx.test.ext:junit:1.1.2'
Expand Down
4 changes: 2 additions & 2 deletions firebase-abt/firebase-abt.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ android {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
exclude group: "com.google.firebase", module: "firebase-common"
}
Expand Down
4 changes: 2 additions & 2 deletions firebase-appdistribution-api/firebase-appdistribution-api.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ android {
}

dependencies {
implementation project(':firebase-components')
implementation project(':firebase-common')
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
testImplementation 'junit:junit:4.13.2'
testImplementation "org.robolectric:robolectric:$robolectricVersion"
Expand Down
6 changes: 3 additions & 3 deletions firebase-appdistribution-api/ktx/ktx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':firebase-common:ktx')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
implementation 'androidx.annotation:annotation:1.1.0'
implementation project(path: ':firebase-appdistribution-api')

Expand Down
7 changes: 3 additions & 4 deletions firebase-appdistribution/firebase-appdistribution.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ android {

dependencies {
implementation project(':firebase-appdistribution-api')
implementation project(':firebase-annotations')
implementation project(':firebase-components')
implementation project(':firebase-installations-interop')
implementation project(':firebase-common')
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
testImplementation project(path: ':firebase-appdistribution')
testImplementation project(':integ-testing')
runtimeOnly project(':firebase-installations')
Expand Down
4 changes: 2 additions & 2 deletions firebase-common/data-collection-tests/data-collection-tests.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ android {
}

dependencies {
implementation(project(":firebase-common"))
implementation(project(":firebase-components"))
implementation("com.google.firebase:firebase-common:20.3.1")
implementation("com.google.firebase:firebase-components:17.1.0")
testImplementation(libs.androidx.test.runner)
testImplementation(libs.androidx.test.junit)
testImplementation(libs.robolectric)
Expand Down
7 changes: 2 additions & 5 deletions firebase-common/firebase-common.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ android {
}

dependencies {
implementation(project(":firebase-annotations"))
implementation(project(":firebase-components"))
implementation("com.google.firebase:firebase-annotations:16.2.0")
implementation("com.google.firebase:firebase-components:17.1.0")
implementation(libs.androidx.futures)
implementation(libs.playservices.basement)
implementation(libs.playservices.tasks)
Expand All @@ -62,9 +62,6 @@ dependencies {
// needed for Kotlin detection to compile, but not necessarily present at runtime.
compileOnly(libs.kotlin.stdlib)

// FirebaseApp references storage, so storage needs to be on classpath when dokka runs.
javadocClasspath(project(":firebase-storage"))

testImplementation(libs.androidx.test.junit)
testImplementation(libs.androidx.test.junit)
testImplementation(libs.androidx.test.runner)
Expand Down
4 changes: 2 additions & 2 deletions firebase-common/ktx/ktx.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ android {
dependencies {
implementation(libs.kotlin.stdlib)

implementation(project(":firebase-annotations"))
implementation("com.google.firebase:firebase-annotations:16.2.0")
implementation(project(":firebase-common"))
implementation(project(":firebase-components"))
implementation("com.google.firebase:firebase-components:17.1.0")
implementation(libs.androidx.annotation)

// We"re exposing this library as a transitive dependency so developers can
Expand Down
2 changes: 1 addition & 1 deletion firebase-components/firebase-components.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android {
}

dependencies {
implementation(project(":firebase-annotations"))
implementation("com.google.firebase:firebase-annotations:16.2.0")
implementation(libs.androidx.annotation)
implementation(libs.errorprone.annotations)

Expand Down
4 changes: 2 additions & 2 deletions ...ase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
}

dependencies {
implementation(project(":firebase-common"))
implementation(project(":firebase-components"))
implementation("com.google.firebase:firebase-common:20.3.1")
implementation("com.google.firebase:firebase-components:17.1.0")
implementation("com.google.android.play:feature-delivery:2.0.0")
}
4 changes: 2 additions & 2 deletions firebase-config/bandwagoner/bandwagoner.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ dependencies {
// This is required since a project dependency on frc does not expose the Apis of its "implementation" dependencies.
// The alternative would be to make common an "api" dep of remote-config.
// It should not matter for released artifacts.
implementation project(":firebase-common")
implementation project(":firebase-components")
implementation "com.google.firebase:firebase-common:20.3.1"
implementation "com.google.firebase:firebase-components:17.1.0"

implementation project(":firebase-installations-interop")
runtimeOnly project(":firebase-installations")
Expand Down
12 changes: 6 additions & 6 deletions firebase-config/firebase-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ android {
}

dependencies {
implementation project(':firebase-annotations')
implementation project(':firebase-common')
implementation project(':firebase-abt')
implementation project(':firebase-components')
implementation project(':firebase-installations-interop')
runtimeOnly project(':firebase-installations')
implementation 'com.google.firebase:firebase-annotations:16.2.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-abt:21.1.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
runtimeOnly 'com.google.firebase:firebase-installations:17.1.2'

implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
10 changes: 5 additions & 5 deletions firebase-config/ktx/ktx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':firebase-common:ktx')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
implementation project(':firebase-config')
implementation project(':firebase-abt')
implementation project(':firebase-installations-interop')
implementation 'com.google.firebase:firebase-abt:21.1.1'
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
runtimeOnly project(':firebase-installations')

implementation 'androidx.annotation:annotation:1.1.0'
Expand Down
4 changes: 2 additions & 2 deletions firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ thirdPartyLicenses {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation project(':firebase-crashlytics')
implementation 'com.google.android.gms:play-services-basement:18.1.0'

Expand Down
16 changes: 8 additions & 8 deletions firebase-crashlytics/firebase-crashlytics.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ thirdPartyLicenses {
dependencies {
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'

implementation project(':encoders:firebase-encoders')
implementation project(':encoders:firebase-encoders-json')
implementation project(':firebase-annotations')
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':transport:transport-api')
implementation 'com.google.firebase:firebase-encoders:17.0.0'
implementation 'com.google.firebase:firebase-encoders-json:18.0.0'
implementation 'com.google.firebase:firebase-annotations:16.2.0'
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.android.datatransport:transport-api:3.0.0'
implementation project(':transport:transport-runtime')
implementation project(':transport:transport-backend-cct')
implementation project(':firebase-installations-interop')
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
runtimeOnly project(':firebase-installations')
implementation 'com.google.firebase:firebase-measurement-connector:18.0.2'
implementation "com.google.android.gms:play-services-tasks:18.0.1"
Expand All @@ -84,7 +84,7 @@ dependencies {
testImplementation 'org.mockito:mockito-core:3.4.3'


androidTestImplementation project(':encoders:firebase-encoders-json')
androidTestImplementation 'com.google.firebase:firebase-encoders-json:18.0.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:core:1.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
Expand Down
6 changes: 3 additions & 3 deletions firebase-crashlytics/ktx/ktx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':firebase-common:ktx')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
implementation project(':firebase-crashlytics')
implementation 'androidx.annotation:annotation:1.1.0'

Expand Down
8 changes: 4 additions & 4 deletions firebase-database/firebase-database.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ android {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-database-collection')
implementation project(':firebase-components')
implementation project(':appcheck:firebase-appcheck-interop')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-database-collection:18.0.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-appcheck-interop:16.1.1'

implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.android.gms:play-services-basement:18.1.0'
Expand Down
6 changes: 3 additions & 3 deletions firebase-database/ktx/ktx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':firebase-common:ktx')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
implementation project(':firebase-database')
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
10 changes: 5 additions & 5 deletions firebase-datatransport/firebase-datatransport.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ android {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation project(':transport:transport-api')
implementation project(':transport:transport-runtime')
implementation project(':transport:transport-backend-cct')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'
implementation 'com.google.android.datatransport:transport-api:3.0.0'
implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
implementation 'com.google.android.datatransport:transport-backend-cct:3.1.8'
implementation 'androidx.annotation:annotation:1.1.0'

testImplementation 'androidx.test:runner:1.2.0'
Expand Down
4 changes: 2 additions & 2 deletions firebase-dynamic-links/firebase-dynamic-links.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ android {
}

dependencies {
implementation project(':firebase-common')
implementation project(':firebase-components')
implementation 'com.google.firebase:firebase-common:20.3.1'
implementation 'com.google.firebase:firebase-components:17.1.0'

implementation 'androidx.annotation:annotation:1.2.0'

Expand Down
Loading