Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ jobs:
with:
distribution: 'zulu'
java-version: 17
- name: Install Node to use the Firebase CLI
uses: actions/setup-node@v6
with:
node-version: 24
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Check Snippets
run: python scripts/checksnippets.py
# TODO(thatfiredev): remove this once github.com/firebase/quickstart-android/issues/1672 is fixed
- name: Remove Firebase Data Connect from CI
run: python scripts/ci_remove_fdc.py
- name: Copy mock google_services.json
run: ./copy_mock_google_services_json.sh
- name: Build with Gradle (Pull Request)
Expand Down
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ tasks.register<JavaExec>("ktlintCheck") {
"--code-style=android_studio",
"--reporter=plain",
"--reporter=checkstyle,output=${outputFile}",
"**/*.kt"
"**/*.kt",
"!**/build/**"
)

jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
Expand Down
3 changes: 2 additions & 1 deletion dataconnect/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
}
}
sourceSets.getByName("main") {
java.srcDirs("build/generated/sources")
kotlin.directories.add("build/generated/sources")
}
}

Expand All @@ -62,6 +62,7 @@ dependencies {
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.compose.material.icons)
implementation(libs.compose.navigation)
implementation(libs.androidx.lifecycle.runtime.compose.android)
implementation(libs.coil.compose)
Expand Down
17 changes: 17 additions & 0 deletions dataconnect/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,20 @@ plugins {
alias(libs.plugins.google.services) apply false
alias(libs.plugins.compose.compiler) apply false
}

tasks {
register<Exec>("dataconnectCompile") {
workingDir = project.file("./dataconnect")
if (org.apache.tools.ant.taskdefs.condition.Os.isFamily(org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS)) {
commandLine("npx.cmd", "-y", "firebase-tools@latest", "dataconnect:compile")
} else {
commandLine("npx", "-y", "firebase-tools@latest", "dataconnect:compile")
}
isIgnoreExitValue = true
}

register("clean", Delete::class) {
delete(rootProject.layout.buildDirectory)
finalizedBy("dataconnectCompile")
}
}
2 changes: 1 addition & 1 deletion dataconnect/dataconnect/movie-connector/connector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ generate:
package: com.google.firebase.dataconnect.movies
# Specify where to store the generated SDK
# We're using the build/ directory so that generated code doesn't get checked into git
outputDir: ../../app/build/generated/sources/com/google/firebase/dataconnect/movies
outputDir: ../../app/build/generated/sources
8 changes: 4 additions & 4 deletions dataconnect/dataconnect/movie-connector/queries.gql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# List subset of fields for movies
query ListMovies($orderByRating: OrderDirection, $orderByReleaseYear: OrderDirection, $limit: Int) @auth(level: PUBLIC) {
query ListMovies($orderByRating: OrderDirection, $orderByReleaseYear: OrderDirection, $limit: Int) @auth(level: PUBLIC, insecureReason: "Test Mode") {
movies(
orderBy: [
{ rating: $orderByRating },
Expand All @@ -19,7 +19,7 @@ query ListMovies($orderByRating: OrderDirection, $orderByReleaseYear: OrderDirec
}

# Get movie by id
query GetMovieById($id: UUID!) @auth(level: PUBLIC) {
query GetMovieById($id: UUID!) @auth(level: PUBLIC, insecureReason: "Test Mode") {
movie(id: $id) {
id
title
Expand Down Expand Up @@ -58,7 +58,7 @@ query GetMovieById($id: UUID!) @auth(level: PUBLIC) {
}

# Get actor by id
query GetActorById($id: UUID!) @auth(level: PUBLIC) {
query GetActorById($id: UUID!) @auth(level: PUBLIC, insecureReason: "Test Mode") {
actor(id: $id) {
id
name
Expand Down Expand Up @@ -130,7 +130,7 @@ query SearchAll(
$minRating: Float!
$maxRating: Float!
$genre: String!
) @auth(level: PUBLIC) {
) @auth(level: PUBLIC, insecureReason: "Test Mode") {
moviesMatchingTitle: movies(
where: {
_and: [
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ kotlin = "2.3.0"
kotlinxSerializationCore = "1.9.0"
lifecycle = "2.10.0"
material = "1.13.0"
materialIcons = "1.7.8"
webkit = "1.14.0"

[libraries]
Expand Down Expand Up @@ -58,6 +59,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationCore" }
material = { module = "com.google.android.material:material", version.ref = "material" }
compose-material-icons = { group = "androidx.compose.material", name = "material-icons-core", version.ref = "materialIcons"}

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand Down
8 changes: 0 additions & 8 deletions scripts/ci_remove_fdc.py

This file was deleted.

Loading