Merge branch 'master' into cramsan/storage_jvm

Author: pontomedon

.firebaserc

@@ -0,0 +1 @@
+{}

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build-pr.yml

@@ -6,12 +6,16 @@ jobs:
     name: Build and Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
-      - name: Build
-        uses: eskatos/gradle-command-action@v1
+      - name: Set up Node.js 20
+        uses: actions/setup-node@v4
         with:
-          arguments: build
+          node-version: 20
+      - name: Install Firebase CLI
+        run: npm install -g firebase-tools
+      - name: Build
+        run: firebase emulators:exec --project my-firebase-project --import=src/test/resources/firebase_data './gradlew build'

.github/workflows/publish.yml

@@ -17,14 +17,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'
       - name: CopyAars
-        uses: eskatos/gradle-command-action@v1
+        uses: eskatos/gradle-command-action@v3
         with:
           arguments: copyAars
       - name: Grant execute permission for gradlew

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 .gradle/
+.kotlin/
 build/
 *.iml
 /local.properties

README.md

@@ -1,4 +1,4 @@
-<h1 align="left">Firebase Java SDK <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/gitliveapp/firebase-java-sdk?style=flat-square"> <a href="https://git.live"><img src="https://img.shields.io/badge/collaborate-on%20gitlive-blueviolet?style=flat-square"></a></h1>
+<h1 align="left">Firebase Java SDK <img alt="GitHub last commit" src="https://img.shields.io/github/last-commit/gitliveapp/firebase-java-sdk?style=flat-square"> <a href="https://git.live"><img src="https://img.shields.io/endpoint?style=flat-square&url=https%3A%2F%2Fteamhub-dev.web.app%2Fbadge%3Forg%3DGitLiveApp%26repo%3Dfirebase-java-sdk"></a></h1>
 <img align="left" width="75px" src="https://avatars2.githubusercontent.com/u/42865805?s=200&v=4"> 
   <b>Built and maintained with 🧡 by <a href="https://git.live">GitLive</a></b><br/>
   <i>Development teams merge faster with GitLive</i><br/>
@@ -25,7 +25,7 @@ You can add the library via Gradle:
 
 ```kotlin
 dependencies {
-    implementation("dev.gitlive:firebase-java-sdk:0.4.3")
+    implementation("dev.gitlive:firebase-java-sdk:0.4.8")
 }
 ```
 
@@ -35,7 +35,7 @@ Or Maven:
 <dependency>
     <groupId>dev.gitlive</groupId>
     <artifactId>firebase-java-sdk</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.8</version>
 </dependency>
 ```
 
@@ -104,16 +104,18 @@ val app = Firebase.initialize(new Application(), options)
 
 The following libraries are available for the various Firebase products.
 
-| Service or Product	                                                          | Port of Android version | 
-|---------------------------------------------------------------------------------|:------------------------|
-| [Authentication](https://firebase.google.com/docs/auth)                         |  N/A[^1]                |
-| [Cloud Firestore](https://firebase.google.com/docs/firestore)                   | `24.10.0`               |
-| [Realtime Database](https://firebase.google.com/docs/database)                  | `20.3.0`                |
-| [Cloud Functions](https://firebase.google.com/docs/functions)                   | `20.4.0`                |
-| [Remote Config](https://firebase.google.com/docs/remote-config)                 | `21.6.0`                |
-| [Installations](https://firebase.google.com/docs/projects/manage-installations) | `17.2.0`                |
+| Service or Product	                                                                               | Port of Android version |
+|---------------------------------------------------------------------------------------------------|:------------------------|
+| [Firebase Android BoM](https://maven.google.com/web/index.html?#com.google.firebase:firebase-bom) | `32.7.0`                |
+| [Authentication](https://firebase.google.com/docs/auth)                                           | N/A[^1]                 |
+| [Cloud Firestore](https://firebase.google.com/docs/firestore)                                     | `24.10.0`               |
+| [Realtime Database](https://firebase.google.com/docs/database)                                    | `20.3.0`                |
+| [Cloud Functions](https://firebase.google.com/docs/functions)                                     | `20.4.0`                |
+| ~[Remote Config](https://firebase.google.com/docs/remote-config)~                                 | `21.6.0`[^2]            |
+| ~[Installations](https://firebase.google.com/docs/projects/manage-installations)~                 | `17.2.0`[^2]            |
 
 [^1]: Google has not open-sourced the Firebase Auth implementation for Android so a basic implementation using the Rest API is provided.
+[^2]: Although the libraries are inlcuded they are currently not funtional 
 
 Is the Firebase library or API you need missing? [Create an issue](https://github.com/GitLiveApp/firebase-java-sdk/issues/new?labels=API+coverage&template=increase-api-coverage.md&title=Add+%5Bclass+name%5D.%5Bfunction+name%5D+to+%5Blibrary+name) to request additional API coverage or be awesome and [submit a PR](https://github.com/GitLiveApp/firebase-java-sdk/fork).
 

build.gradle.kts

@@ -1,3 +1,4 @@
+import java.util.Locale
 
 buildscript {
     repositories {
@@ -16,10 +17,10 @@ plugins {
     `java-library`
     `maven-publish`
     signing
-    id("org.jetbrains.kotlin.jvm") version "1.9.22"
-    kotlin("plugin.serialization") version "1.9.22"
-    id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
-    id("com.github.ben-manes.versions") version "0.42.0"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.jlleitschuh.ktlint)
+    alias(libs.plugins.ben.manes.versions)
 }
 
 group = "dev.gitlive"
@@ -87,7 +88,7 @@ val jar by tasks.getting(Jar::class) {
 val sourceSets = project.the<SourceSetContainer>()
 
 val cleanLibs by tasks.creating(Delete::class) {
-    delete("$buildDir/libs")
+    delete("$${layout.buildDirectory.asFile.get().path}/libs")
 }
 
 publishing {
@@ -202,39 +203,40 @@ val includeList = listOf(
     "slidingpanelayout-*.jar",
     "swiperefreshlayout-*.jar",
     "versionedparcelable-*.jar",
-    "viewpager-*.jar",
+    "viewpager-*.jar"
 )
 
 dependencies {
-    compileOnly("org.robolectric:android-all:12.1-robolectric-8229987")
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.3")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
-    testImplementation("org.mockito:mockito-core:5.12.0")
+    compileOnly(libs.robolectric.android.all)
+    testImplementation(libs.junit)
+    testImplementation(libs.kotlinx.coroutines.play.services)
+    testImplementation(libs.kotlinx.coroutines.swing)
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockito.core)
     // firebase aars
-    aar("com.google.firebase:firebase-firestore:24.10.0")
-    aar("com.google.firebase:firebase-functions:20.4.0")
-    aar("com.google.firebase:firebase-database:20.3.0")
-    aar("com.google.firebase:firebase-config:21.6.0")
-    aar("com.google.firebase:firebase-installations:17.2.0")
-    aar("com.google.firebase:firebase-storage:21.0.0")
+    aar(platform(libs.google.firebase.bom))
+    aar(libs.google.firebase.firestore)
+    aar(libs.google.firebase.functions)
+    aar(libs.google.firebase.database)
+    aar(libs.google.firebase.config)
+    aar(libs.google.firebase.installations)
+    aar(libs.google.firebase.storage)
     // extracted aar dependencies
     api(fileTree(mapOf("dir" to "build/jar", "include" to includeList)))
     // polyfill dependencies
-    implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
-    implementation("org.xerial:sqlite-jdbc:3.44.1.0")
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.xerial.sqlite.jdbc)
     // firebase dependencies
-    implementation("javax.inject:javax.inject:1")
-    implementation("com.squareup.okhttp3:okhttp:3.12.13")
-    implementation("io.grpc:grpc-protobuf-lite:1.52.1")
-    implementation("io.grpc:grpc-stub:1.52.1")
-    implementation("androidx.collection:collection:1.2.0")
-    implementation("io.grpc:grpc-okhttp:1.52.1")
-    implementation("androidx.lifecycle:lifecycle-common:2.8.0-rc01")
-    implementation("androidx.lifecycle:lifecycle-viewmodel:2.8.0-rc01")
+    implementation(libs.javax.inject)
+    implementation(libs.okhttp)
+    implementation(libs.io.grpc.protobuf.lite)
+    implementation(libs.io.grpc.stub)
+    implementation(libs.androidx.collection)
+    implementation(libs.io.grpc.okhttp)
+    implementation(libs.androidx.lifecycle.common)
+    implementation(libs.androidx.lifecycle.viewmodel)
 }
 
 tasks.named("publishToMavenLocal").configure {
@@ -246,7 +248,7 @@ tasks.named("publish").configure {
 }
 
 ktlint {
-    version.set("0.41.0")
+    version.set(libs.versions.ktlint.get())
 }
 
 signing {
@@ -259,7 +261,8 @@ signing {
 tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
 
     fun isNonStable(version: String): Boolean {
-        val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+        val stableKeyword = listOf("RELEASE", "FINAL", "GA")
+            .any { version.uppercase(Locale.ROOT).contains(it) }
         val versionMatch = "^[0-9,.v-]+(-r)?$".toRegex().matches(version)
 
         return (stableKeyword || versionMatch).not()

firebase.json

@@ -0,0 +1,11 @@
+{
+  "emulators": {
+    "auth": {
+      "port": 9099
+    },
+    "ui": {
+      "enabled": true
+    },
+    "singleProjectMode": true
+  }
+}

gradle.properties

@@ -1 +1 @@
-version=0.4.3
+version=0.4.8

gradle/libs.versions.toml

@@ -0,0 +1,44 @@
+[versions]
+androidx-lifecycle = "2.9.0-alpha01"
+ben-manes-versions = "0.51.0"
+google-firebase-bom = "32.7.0"
+io-grpc = "1.66.0"
+jlleitschuh-ktlint = "12.1.1"
+kotlin = "2.0.20"
+kotlinx-coroutines = "1.8.1"
+kotlinx-serialization = "1.7.2"
+ktlint = "0.47.1"
+mockito = "5.12.0"
+
+[libraries]
+androidx-collection = { module = "androidx.collection:collection", version = "1.4.3" }
+androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
+google-firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "google-firebase-bom" }
+google-firebase-config = { module = "com.google.firebase:firebase-config" }
+google-firebase-database = { module = "com.google.firebase:firebase-database" }
+google-firebase-firestore = { module = "com.google.firebase:firebase-firestore" }
+google-firebase-functions = { module = "com.google.firebase:firebase-functions" }
+google-firebase-installations = { module = "com.google.firebase:firebase-installations" }
+google-firebase-storage = { module = "com.google.firebase:firebase-storage" }
+io-grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "io-grpc" }
+io-grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "io-grpc" }
+io-grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "io-grpc" }
+javax-inject = { module = "javax.inject:javax.inject", version = "1" }
+junit = { module = "junit:junit", version = "4.13.2" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
+kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
+robolectric-android-all = { module = "org.robolectric:android-all", version = "14-robolectric-10818077" }
+xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.46.1.0" }
+
+[plugins]
+ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "ben-manes-versions" }
+jlleitschuh-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "jlleitschuh-ktlint" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }