Skip to content

Migrate Database to KTS + VC #4816

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.

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 27 commits into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ed094cf
migrate firebase-database to kotlin script
daymxn Mar 23, 2023
1badc62
Merge branch 'master' into daymon-migrate-database-buildscript
daymxn Mar 23, 2023
ac46b8c
Use StringResourceValueReader to get resource for test
daymxn Mar 23, 2023
cefc4f8
Fix source paths
daymxn Mar 23, 2023
d3f3a59
Apply GSP for tests
daymxn Mar 23, 2023
e708492
Clean up firebase-database
daymxn Mar 24, 2023
3c0e923
Add kotlinx-coroutines-core to version catalog
daymxn Mar 24, 2023
ac83a65
Refactor firebase-database-ktx to KTS + VC
daymxn Mar 24, 2023
32220fc
Refactor firebase-database-collection to KTS + VC
daymxn Mar 24, 2023
a8f45d9
ktfmt
daymxn Mar 24, 2023
3c4a58b
ktfmt for firebase-database
daymxn Mar 24, 2023
3c20d9b
Remove redundant source sets
daymxn Mar 24, 2023
2a86bab
Merge branch 'master' into daymon-migrate-database-buildscript
daymxn Mar 24, 2023
8cb8f44
Clean up IntegrationTestValues
daymxn Mar 24, 2023
d82f39a
Revert "Remove redundant source sets"
daymxn Mar 24, 2023
c717d9d
Add missing jackson libs
daymxn Mar 24, 2023
1f184a0
Merge branch 'master' into daymon-migrate-database-buildscript
daymxn Mar 25, 2023
bcb67cc
Add missing packages pt 2
daymxn Mar 27, 2023
6bee7e3
Add quickcheck to version toml
daymxn Mar 27, 2023
a11373e
toml formatting
daymxn Mar 27, 2023
7135ff5
Apply valid toml libs + ktfmt
daymxn Mar 27, 2023
b1a56a4
Additional reordering because OCD
daymxn Mar 27, 2023
59a61ee
Remove exclusion of firebase-common in auth-interop
daymxn Mar 28, 2023
f7ac557
Add bundle for playservices dependencies
daymxn Mar 29, 2023
f0a40d5
Bump database dep versions
daymxn Mar 29, 2023
45773ea
Merge branch 'master' into daymon-migrate-database-buildscript
daymxn Mar 29, 2023
41beac6
Reordering of deps
daymxn Mar 29, 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
44 changes: 0 additions & 44 deletions firebase-database-collection/firebase-database-collection.gradle

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

plugins { id("firebase-library") }

firebaseLibrary {
publishSources = true
publishJavadoc = false
}

android {
val targetSdkVersion: Int by rootProject
val minSdkVersion: Int by rootProject

compileSdk = targetSdkVersion

defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}

dependencies {
implementation(libs.playservices.base)

testImplementation(libs.junit)
testImplementation(libs.quickcheck)

testAnnotationProcessor("net.java:quickcheck-src-generator:0.6")
testAnnotationProcessor("net.java.quickcheck:quickcheck-src-generator:0.6")
}
125 changes: 0 additions & 125 deletions firebase-database/firebase-database.gradle

This file was deleted.

85 changes: 85 additions & 0 deletions firebase-database/firebase-database.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

plugins { id("firebase-library") }

firebaseLibrary {
testLab.enabled = true
publishSources = true
}

android {
val targetSdkVersion: Int by rootProject
val minSdkVersion: Int by rootProject

installation.timeOutInMs = 60 * 1000
compileSdk = targetSdkVersion

defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes { release { isMinifyEnabled = false } }

sourceSets {
named("androidTest") { java.srcDir("src/testUtil/java") }
named("test") { java.srcDir("src/testUtil") }

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

packagingOptions.resources.excludes += "META-INF/DEPENDENCIES"
testOptions.unitTests.isIncludeAndroidResources = true
}
}

dependencies {
implementation("com.google.firebase:firebase-common:20.3.2")
implementation("com.google.firebase:firebase-components:17.1.0")
implementation("com.google.firebase:firebase-auth-interop:20.0.0")
implementation("com.google.firebase:firebase-appcheck-interop:16.1.1")
implementation("com.google.firebase:firebase-database-collection:18.0.1")

implementation(libs.androidx.annotation)
implementation(libs.bundles.playservices)

testImplementation(libs.truth)
testImplementation(libs.junit)
testImplementation(libs.quickcheck)
testImplementation(libs.robolectric)
testImplementation(libs.mockito.core)
testImplementation(libs.androidx.test.core)
testImplementation(libs.androidx.test.rules)
testImplementation("com.firebase:firebase-token-generator:2.0.0")
testImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")

androidTestImplementation(libs.truth)
androidTestImplementation(libs.quickcheck)
androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation("org.hamcrest:hamcrest:2.2")
androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
androidTestImplementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
androidTestImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.1")
}

ext["packageName"] = "com.google.firebase.database"

apply("../gradle/googleServices.gradle")
65 changes: 0 additions & 65 deletions firebase-database/ktx/ktx.gradle

This file was deleted.

Loading