Merge pull request #1 from TeamHubApp/new-api

New api

Author: nbransby

build.gradle.kts

@@ -1,5 +1,7 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
+
 plugins {
-    kotlin("multiplatform") version "1.3.50" apply false
+    kotlin("multiplatform") version "1.3.61" apply false
 }
 
 buildscript {
@@ -26,18 +28,26 @@ subprojects {
         jcenter()
     }
 
+    tasks.withType<KotlinCompile<*>> {
+        kotlinOptions.freeCompilerArgs += listOf(
+            "-Xuse-experimental=kotlin.Experimental",
+            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-Xuse-experimental=kotlinx.serialization.ImplicitReflectionSerializer"
+        )
+    }
+
     afterEvaluate  {
         dependencies {
             "commonMainImplementation"(kotlin("stdlib-common"))
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.2")
+            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.3")
             "jsMainImplementation"(kotlin("stdlib-js"))
-            "jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.2.2")
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2")
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.2.2")
+            "jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.3")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.3")
             "jvmMainImplementation"(kotlin("stdlib-jdk8"))
-            "jvmMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2")
-            "jvmMainApi"("app.teamhub:firebase-java:0.2.0")
-            "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.2.2")
+            "jvmMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
+            "jvmMainApi"("app.teamhub:firebase-java:0.3.0")
+            "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.3")
         }
     }
 }

firebase-app/build.gradle.kts

@@ -9,7 +9,8 @@ repositories {
     mavenCentral()
     google()
 }
-version = "0.1.0"
+
+version = "0.1.0-dev"
 
 android {
     compileSdkVersion(property("targetSdkVersion") as Int)
@@ -32,6 +33,13 @@ kotlin {
             }
         }
     }
+//    js("reactnative") {
+//        val main by compilations.getting {
+//            kotlinOptions {
+//                moduleKind = "commonjs"
+//            }
+//        }
+//    }
     android {
         publishLibraryVariants("release", "debug")
     }
@@ -51,7 +59,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common:17.1.0")
+                api("com.google.firebase:firebase-common:19.2.0")
             }
         }
         val jvmMain by getting {
@@ -73,6 +81,7 @@ tasks {
             into.createNewFile()
             into.writeText(from.readText()
                 .replace("require('firebase-", "require('@teamhubapp/firebase-")
+                .replace("require('kotlinx-serialization-kotlinx-serialization-runtime')", "require('@cachet/kotlinx-serialization-runtime')")
             )
         }
     }
@@ -90,9 +99,9 @@ tasks {
         dependsOn(copyPackageJson, copyJS, copySourceMap)
         workingDir("$buildDir/node_module")
         if(Os.isFamily(Os.FAMILY_WINDOWS)) {
-            commandLine("cmd", "/c", "npm publish --registry https://npm.pkg.github.com/")
+            commandLine("cmd", "/c", "npm publish --registry  http://localhost:4873")
         } else {
-            commandLine("npm", "publish", "--registry https://npm.pkg.github.com/")
+            commandLine("npm", "publish", "--registry  http://localhost:4873")
         }
     }
 }

firebase-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamhubapp/firebase-app",
-  "version": "0.1.0",
+  "version": "0.1.0-dev9",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-app.js",
   "scripts": {
@@ -23,10 +23,10 @@
   },
   "homepage": "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "@teamhubapp/firebase-common": "0.1.0",
+    "@teamhubapp/firebase-common": "0.1.0-dev9",
     "firebase": "6.2.3",
-    "kotlin": "1.3.50",
-    "kotlinx-coroutines-core": "1.2.2"
+    "kotlin": "1.3.61",
+    "kotlinx-coroutines-core": "1.3.3"
   }
 }
 

firebase-app/src/androidMain/kotlin/dev/teamhub/firebase/firebase.kt

@@ -10,48 +10,36 @@ actual typealias FirebaseTooManyRequestsException = com.google.firebase.Firebase
 
 actual typealias FirebaseApiNotAvailableException = com.google.firebase.FirebaseApiNotAvailableException
 
-actual fun initializeFirebaseApp(context: Any, options: FirebaseOptions) =
-    FirebaseApp.initializeApp(context as Context, options)
+actual val Firebase.app: FirebaseApp
+    get() = FirebaseApp(com.google.firebase.FirebaseApp.getInstance())
 
-actual typealias FirebaseApp = com.google.firebase.FirebaseApp
+actual fun Firebase.app(name: String): FirebaseApp =
+    FirebaseApp(com.google.firebase.FirebaseApp.getInstance(name))
 
-actual typealias FirebaseOptions = com.google.firebase.FirebaseOptions
+actual fun Firebase.initialize(context: Any?): FirebaseApp? =
+    com.google.firebase.FirebaseApp.initializeApp(context as Context)?.let { FirebaseApp(it) }
 
-actual typealias FirebaseOptionsBuilder = com.google.firebase.FirebaseOptions.Builder
+actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
+    FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid(), name))
 
-actual fun getFirebaseApps(context: Any) = FirebaseApp.getApps(context as Context)
+actual fun Firebase.initialize(context: Any?, options: FirebaseOptions) =
+    FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
 
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.setApiKey(apiKey: String): FirebaseOptionsBuilder {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+actual class FirebaseApp internal constructor(val android: com.google.firebase.FirebaseApp) {
+    actual val name: String
+        get() = android.name
+    actual val options: FirebaseOptions
+        get() = android.options.run { FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId) }
 }
 
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.setApplicationId(applicationId: String): FirebaseOptionsBuilder {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.setDatabaseUrl(databaseUrl: String?): FirebaseOptionsBuilder {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.setStorageBucket(storageBucket: String?): FirebaseOptionsBuilder {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.setProjectId(projectId: String?): FirebaseOptionsBuilder {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.build(): FirebaseOptions {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
-
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-actual fun FirebaseOptionsBuilder.setGoogleAppId(googleAppId: String): FirebaseOptionsBuilder {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-}
+actual fun Firebase.apps(context: Any?) = com.google.firebase.FirebaseApp.getApps(context as Context)
+    .map { FirebaseApp(it) }
+
+private fun FirebaseOptions.toAndroid() = com.google.firebase.FirebaseOptions.Builder()
+    .setApplicationId(applicationId)
+    .setApiKey(apiKey)
+    .setDatabaseUrl(databaseUrl)
+    .setGaTrackingId(gaTrackingId)
+    .setStorageBucket(storageBucket)
+    .setProjectId(projectId)
+    .build()

firebase-app/src/commonMain/kotlin/dev/teamhub/firebase/firebase.kt

@@ -1,23 +1,52 @@
-@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+@file:JvmMultifileClass
+@file:JvmName("CommonKt")
 package dev.teamhub.firebase
 
-expect fun initializeFirebaseApp(context: Any, options: FirebaseOptions): FirebaseApp
+import kotlin.jvm.JvmMultifileClass
+import kotlin.jvm.JvmName
 
-expect class FirebaseApp
+/**
+ * Single access point to all firebase sdks from Kotlin.
+ *
+ * <p>Acts as a target for extension methods provided by sdks.
+ */
+object Firebase
 
-expect fun getFirebaseApps(context: Any): List<FirebaseApp>
+expect class FirebaseApp {
+    val name: String
+    val options: FirebaseOptions
+}
 
-expect class FirebaseOptions
+/** Returns the default firebase app instance. */
+expect val Firebase.app: FirebaseApp
 
-expect class FirebaseOptionsBuilder()
+/** Returns a named firebase app instance. */
+expect fun Firebase.app(name: String): FirebaseApp
 
-expect fun FirebaseOptionsBuilder.setGoogleAppId(googleAppId: String): FirebaseOptionsBuilder
-expect fun FirebaseOptionsBuilder.setApiKey(apiKey: String): FirebaseOptionsBuilder
-expect fun FirebaseOptionsBuilder.setApplicationId(applicationId: String): FirebaseOptionsBuilder
-expect fun FirebaseOptionsBuilder.setDatabaseUrl(databaseUrl: String?): FirebaseOptionsBuilder
-expect fun FirebaseOptionsBuilder.setStorageBucket(storageBucket: String?): FirebaseOptionsBuilder
-expect fun FirebaseOptionsBuilder.setProjectId(projectId: String?): FirebaseOptionsBuilder
-expect fun FirebaseOptionsBuilder.build(): FirebaseOptions
+/** Returns all firebase app instances. */
+expect fun Firebase.apps(context: Any? = null): List<FirebaseApp>
+
+/** Initializes and returns a FirebaseApp. */
+expect fun Firebase.initialize(context: Any? = null): FirebaseApp?
+
+/** Initializes and returns a FirebaseApp. */
+expect fun Firebase.initialize(context: Any? = null, options: FirebaseOptions): FirebaseApp
+
+/** Initializes and returns a FirebaseApp. */
+expect fun Firebase.initialize(context: Any? = null, options: FirebaseOptions, name: String): FirebaseApp
+
+/** Returns options of default FirebaseApp */
+val Firebase.options: FirebaseOptions
+    get() = Firebase.app.options
+
+data class FirebaseOptions(
+    val applicationId: String,
+    val apiKey: String,
+    val databaseUrl: String? = null,
+    val gaTrackingId: String? = null,
+    val storageBucket: String? = null,
+    val projectId: String? = null
+)
 
 expect open class FirebaseException : Exception
 

firebase-app/src/jsMain/kotlin/dev/teamhub/firebase/externals.kt

@@ -1,54 +1,43 @@
 package dev.teamhub.firebase
 
-import kotlin.js.Json
 import kotlin.js.json
-import kotlin.reflect.KClass
-
-actual typealias FirebaseApp = firebase.App
-
-actual fun initializeFirebaseApp(context: Any, options: FirebaseOptions) =  firebase.initializeApp(
-        json(
-            "apiKey" to options.apiKey,
-            "applicationId" to options.applicationId,
-            "databaseURL" to options.databaseUrl,
-            "storageBucket" to options.storageBucket,
-            "projectId" to options.projectId,
-            "googleAppId" to options.googleAppId
-        )
-)
-
-actual data class FirebaseOptions constructor(
-         val apiKey: String? = undefined,
-         val applicationId: String? = undefined,
-         val databaseUrl: String? = undefined,
-         val storageBucket: String? = undefined,
-         val projectId: String? = undefined,
-         val googleAppId: String? = undefined
-)
-
-actual class FirebaseOptionsBuilder actual constructor() {
-    var options = FirebaseOptions()
-}
 
-actual open class FirebaseException(code: String?, message: String?) : Exception("$code: $message")
+actual val Firebase.app: FirebaseApp
+    get() = FirebaseApp(firebase.app())
 
-actual fun getFirebaseApps(context: Any) = firebase.apps.toList()
+actual fun Firebase.app(name: String): FirebaseApp =
+    FirebaseApp(firebase.app(name))
 
-actual open class FirebaseNetworkException(code: String?, message: String?) : FirebaseException(code, message)
-actual open class FirebaseTooManyRequestsException(code: String?, message: String?) : FirebaseException(code, message)
-actual open class FirebaseApiNotAvailableException(code: String?, message: String?) : FirebaseException(code, message)
+actual fun Firebase.initialize(context: Any?): FirebaseApp? =
+    throw UnsupportedOperationException("Cannot initialize firebase without options in JS")
 
-actual fun FirebaseOptionsBuilder.setGoogleAppId(googleAppId: String) = options.copy(googleAppId = googleAppId).let { options = it }.let { this }
+actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
+    FirebaseApp(firebase.initializeApp(options.toJson(), name))
 
-actual fun FirebaseOptionsBuilder.setApiKey(apiKey: String) = options.copy(apiKey = apiKey).let { options = it }.let { this }
+actual fun Firebase.initialize(context: Any?, options: FirebaseOptions) =
+    FirebaseApp(firebase.initializeApp(options.toJson()))
 
-actual fun FirebaseOptionsBuilder.setApplicationId(applicationId: String) = options.copy(applicationId = applicationId).let { options = it }.let { this }
-
-actual fun FirebaseOptionsBuilder.setDatabaseUrl(databaseUrl: String?) = options.copy(databaseUrl = databaseUrl).let { options = it }.let { this }
-
-actual fun FirebaseOptionsBuilder.setStorageBucket(storageBucket: String?) = options.copy(storageBucket = storageBucket).let { options = it }.let { this }
+actual class FirebaseApp internal constructor(val js: firebase.App) {
+    actual val name: String
+        get() = js.name
+    actual val options: FirebaseOptions
+        get() = js.options.run {
+            FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId)
+        }
+}
 
-actual fun FirebaseOptionsBuilder.setProjectId(projectId: String?) = options.copy(projectId = projectId).let { options = it }.let { this }
+actual fun Firebase.apps(context: Any?) = firebase.apps.map { FirebaseApp(it) }
 
-actual fun FirebaseOptionsBuilder.build() = options
+private fun FirebaseOptions.toJson() = json(
+    "apiKey" to apiKey,
+    "applicationId" to applicationId,
+    "databaseURL" to databaseUrl,
+    "storageBucket" to storageBucket,
+    "projectId" to projectId,
+    "gaTrackingId" to gaTrackingId
+)
 
+actual open class FirebaseException(code: String?, cause: Throwable) : Exception("$code: ${cause.message}", cause)
+actual open class FirebaseNetworkException(code: String?, cause: Throwable) : FirebaseException(code, cause)
+actual open class FirebaseTooManyRequestsException(code: String?, cause: Throwable) : FirebaseException(code, cause)
+actual open class FirebaseApiNotAvailableException(code: String?, cause: Throwable) : FirebaseException(code, cause)