Merge remote-tracking branch 'origin/database-transactions' into database-transactions

# Conflicts:
#	firebase-database/build.gradle.kts

Author: michaelprichardson

build.gradle.kts

@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    kotlin("multiplatform") version "1.5.31" apply false
+    kotlin("multiplatform") version "1.5.32" apply false
     id("base")
 }
 
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.3")
+        classpath("com.android.tools.build:gradle:7.0.4")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }

firebase-common/build.gradle.kts

@@ -9,7 +9,7 @@ version = project.property("firebase-common.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.5.31"
+    kotlin("plugin.serialization") version "1.5.32"
 }
 
 android {

firebase-database/build.gradle.kts

@@ -10,7 +10,7 @@ version = project.property("firebase-database.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.5.31"
+    kotlin("plugin.serialization") version "1.5.32"
 }
 
 repositories {
@@ -23,17 +23,11 @@ android {
     defaultConfig {
         minSdk = property("minSdkVersion") as Int
         targetSdk = property("targetSdkVersion") as Int
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled = true
     }
     sourceSets {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
-        getByName("androidTest"){
-            java.srcDir(file("src/androidAndroidTest/kotlin"))
-            manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")
-        }
     }
     testOptions {
         unitTests.apply {
@@ -135,9 +129,9 @@ kotlin {
                 apiVersion = "1.5"
                 languageVersion = "1.5"
                 progressiveMode = true
-                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
-                optIn("kotlinx.coroutines.FlowPreview")
-                optIn("kotlinx.serialization.InternalSerializationApi")
+//                optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
+//                optIn("kotlinx.coroutines.FlowPreview")
+//                optIn("kotlinx.serialization.InternalSerializationApi")
             }
         }
 

firebase-database/src/androidMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -195,15 +195,19 @@ actual class DatabaseReference internal constructor(
         val deferred = CompletableDeferred<DataSnapshot>()
         android.runTransaction(object : Transaction.Handler {
 
-            override fun doTransaction(currentData: MutableData) =
-                Transaction.success(transactionUpdate(decode(strategy, currentData)) as MutableData)
+            override fun doTransaction(currentData: MutableData): Transaction.Result {
+                currentData.value = currentData.value?.let {
+                    transactionUpdate(decode(strategy, it))
+                }
+                return Transaction.success(currentData)
+            }
 
             override fun onComplete(
                 error: DatabaseError?,
                 committed: Boolean,
                 snapshot: com.google.firebase.database.DataSnapshot?
             ) {
-                if(error != null) {
+                if (error != null) {
                     deferred.completeExceptionally(error.toException())
                 } else {
                     deferred.complete(DataSnapshot(snapshot!!))

firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -165,7 +165,7 @@ actual class DatabaseReference internal constructor(
         val deferred = CompletableDeferred<DataSnapshot>()
         ios.runTransactionBlock(
             block = { firMutableData ->
-                FIRTransactionResult.successWithValue(transactionUpdate(decode(strategy, firMutableData)) as FIRMutableData)
+                FIRTransactionResult.successWithValue(transactionUpdate(decode(strategy, firMutableData.value)))
             },
             andCompletionBlock = { error, _, snapshot ->
                 if (error != null) {

firebase-firestore/build.gradle.kts

@@ -10,7 +10,7 @@ version = project.property("firebase-firestore.version") as String
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
-    kotlin("plugin.serialization") version "1.5.31"
+    kotlin("plugin.serialization") version "1.5.32"
 }
 
 android {