Skip to content

Commit 46cc259

Browse files
suntrixsuntrix
authored
updated Kotlin to 1.4.31 & some of the dependencies (#155)
* updated Kotlin to 1.4.31 & some of the dependencies * serialization update
1 parent 505ba3c commit 46cc259

File tree

12 files changed

+96
-55
lines changed

12 files changed

+96
-55
lines changed

‎build.gradle.kts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
44
import org.gradle.api.tasks.testing.logging.TestLogEvent
55

66
plugins {
7-
kotlin("multiplatform") version "1.4.21" apply false
7+
kotlin("multiplatform") version "1.4.31" apply false
88
id("base")
99
}
1010

@@ -18,8 +18,8 @@ buildscript {
1818
}
1919
}
2020
dependencies {
21-
classpath("com.android.tools.build:gradle:4.1.1")
22-
classpath("com.adarshr:gradle-test-logger-plugin:2.0.0")
21+
classpath("com.android.tools.build:gradle:4.1.2")
22+
classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
2323
}
2424
}
2525

@@ -156,16 +156,18 @@ subprojects {
156156
}
157157
}
158158

159-
listOf("bootstrap", "update").forEach {
160-
task<Exec>("carthage${it.capitalize()}") {
161-
group = "carthage"
162-
executable = "carthage"
163-
args(
164-
it,
165-
"--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),
166-
"--platform", "iOS",
167-
"--cache-builds"
168-
)
159+
if (projectDir.resolve("src/nativeInterop/cinterop/Cartfile").exists()) { // skipping firebase-common module
160+
listOf("bootstrap", "update").forEach {
161+
task<Exec>("carthage${it.capitalize()}") {
162+
group = "carthage"
163+
executable = "carthage"
164+
args(
165+
it,
166+
"--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),
167+
"--platform", "iOS",
168+
"--cache-builds"
169+
)
170+
}
169171
}
170172
}
171173

@@ -196,15 +198,15 @@ subprojects {
196198

197199
dependencies {
198200
"commonMainImplementation"(kotlin("stdlib-common"))
199-
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
201+
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
200202
"jsMainImplementation"(kotlin("stdlib-js"))
201-
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.2")
203+
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.3")
202204
"commonTestImplementation"(kotlin("test-common"))
203205
"commonTestImplementation"(kotlin("test-annotations-common"))
204-
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
206+
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
205207
"jsTestImplementation"(kotlin("test-js"))
206208
"androidAndroidTestImplementation"(kotlin("test-junit"))
207-
"androidAndroidTestImplementation"("junit:junit:4.13")
209+
"androidAndroidTestImplementation"("junit:junit:4.13.1")
208210
"androidAndroidTestImplementation"("androidx.test:core:1.3.0")
209211
"androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.2")
210212
"androidAndroidTestImplementation"("androidx.test:runner:1.3.0")

‎firebase-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-common": "1.2.0",
27-
"firebase": "8.2.3",
28-
"kotlin": "1.4.21",
29-
"kotlinx-coroutines-core": "1.4.2"
27+
"firebase": "8.2.10",
28+
"kotlin": "1.4.31",
29+
"kotlinx-coroutines-core": "1.4.3"
3030
}
3131
}

‎firebase-auth/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ kotlin {
125125

126126
val androidMain by getting {
127127
dependencies {
128-
api("com.google.firebase:firebase-auth:20.0.2")
128+
api("com.google.firebase:firebase-auth:20.0.3")
129129
}
130130
}
131131

‎firebase-auth/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.2.0",
27-
"firebase": "8.2.3",
28-
"kotlin": "1.4.21",
29-
"kotlinx-coroutines-core": "1.4.2"
27+
"firebase": "8.2.10",
28+
"kotlin": "1.4.31",
29+
"kotlinx-coroutines-core": "1.4.3"
3030
}
3131
}

‎firebase-common/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = project.property("firebase-common.version") as String
99
plugins {
1010
id("com.android.library")
1111
kotlin("multiplatform")
12-
kotlin("plugin.serialization") version "1.4.21"
12+
kotlin("plugin.serialization") version "1.4.31"
1313
}
1414

1515
android {
@@ -77,7 +77,7 @@ kotlin {
7777

7878
val commonMain by getting {
7979
dependencies {
80-
api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.1")
80+
api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0")
8181
}
8282
}
8383

‎firebase-common/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
},
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
2525
"dependencies": {
26-
"firebase": "8.2.3",
27-
"kotlin": "1.4.21",
28-
"kotlinx-coroutines-core": "1.4.2",
29-
"kotlinx-serialization-kotlinx-serialization-runtime": "1.0.1"
26+
"firebase": "8.2.10",
27+
"kotlin": "1.4.31",
28+
"kotlinx-coroutines-core": "1.4.3",
29+
"kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"
3030
}
3131
}

‎firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/decoders.kt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ class FirebaseDecoder(internal val value: Any?, private val decodeDouble: (value
5858
override fun decodeNotNullMark() = decodeNotNullMark(value)
5959

6060
override fun decodeNull() = decodeNull(value)
61+
62+
@ExperimentalSerializationApi
63+
override fun decodeInline(inlineDescriptor: SerialDescriptor): Decoder =
64+
FirebaseDecoder(value, decodeDouble)
6165
}
6266

6367
class FirebaseClassDecoder(
@@ -98,10 +102,12 @@ open class FirebaseCompositeDecoder constructor(
98102

99103
override fun decodeCollectionSize(descriptor: SerialDescriptor) = size
100104

101-
override fun <T> decodeSerializableElement(descriptor: SerialDescriptor,
102-
index: Int, deserializer: DeserializationStrategy<T>, previousValue: T? ): T {
103-
return deserializer.deserialize(FirebaseDecoder(get(descriptor, index), decodeDouble))
104-
}
105+
override fun <T> decodeSerializableElement(
106+
descriptor: SerialDescriptor,
107+
index: Int,
108+
deserializer: DeserializationStrategy<T>,
109+
previousValue: T?
110+
) = deserializer.deserialize(FirebaseDecoder(get(descriptor, index), decodeDouble))
105111

106112
override fun decodeBooleanElement(descriptor: SerialDescriptor, index: Int) = decodeBoolean(get(descriptor, index))
107113

@@ -129,8 +135,11 @@ open class FirebaseCompositeDecoder constructor(
129135

130136
override fun decodeStringElement(descriptor: SerialDescriptor, index: Int) = decodeString(get(descriptor, index))
131137

132-
override fun endStructure(descriptor: SerialDescriptor) {
133-
}
138+
override fun endStructure(descriptor: SerialDescriptor) {}
139+
140+
@ExperimentalSerializationApi
141+
override fun decodeInlineElement(descriptor: SerialDescriptor, index: Int): Decoder =
142+
FirebaseDecoder(get(descriptor, index), decodeDouble)
134143
}
135144

136145
private fun decodeString(value: Any?) = value.toString()

‎firebase-common/src/commonMain/kotlin/dev/gitlive/firebase/encoders.kt

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ class FirebaseEncoder(internal val shouldEncodeElementDefault: Boolean, positive
7272
override fun encodeString(value: String) {
7373
this.value = value
7474
}
75+
76+
@ExperimentalSerializationApi
77+
override fun encodeInline(inlineDescriptor: SerialDescriptor): Encoder =
78+
FirebaseEncoder(shouldEncodeElementDefault, positiveInfinity)
7579
}
7680

7781
abstract class TimestampEncoder(internal val positiveInfinity: Any) {
@@ -100,29 +104,55 @@ open class FirebaseCompositeEncoder constructor(
100104

101105
override fun shouldEncodeElementDefault(descriptor: SerialDescriptor, index: Int) = shouldEncodeElementDefault
102106

103-
override fun <T : Any> encodeNullableSerializableElement(descriptor: SerialDescriptor, index: Int, serializer: SerializationStrategy<T>, value: T?) =
104-
set(descriptor, index, value?.let { FirebaseEncoder(shouldEncodeElementDefault, positiveInfinity).apply { encodeSerializableValue(serializer, value) }.value })
105-
106-
override fun <T> encodeSerializableElement(descriptor: SerialDescriptor, index: Int, serializer: SerializationStrategy<T>, value: T) =
107-
set(descriptor, index, FirebaseEncoder(shouldEncodeElementDefault, positiveInfinity).apply { encodeSerializableValue(serializer, value) }.value)
107+
override fun <T : Any> encodeNullableSerializableElement(
108+
descriptor: SerialDescriptor,
109+
index: Int,
110+
serializer: SerializationStrategy<T>,
111+
value: T?
112+
) = set(
113+
descriptor,
114+
index,
115+
value?.let {
116+
FirebaseEncoder(shouldEncodeElementDefault, positiveInfinity).apply {
117+
encodeSerializableValue(serializer, value)
118+
}.value
119+
}
120+
)
121+
122+
override fun <T> encodeSerializableElement(
123+
descriptor: SerialDescriptor,
124+
index: Int,
125+
serializer: SerializationStrategy<T>,
126+
value: T
127+
) = set(
128+
descriptor,
129+
index,
130+
FirebaseEncoder(shouldEncodeElementDefault, positiveInfinity).apply {
131+
encodeSerializableValue(serializer, value)
132+
}.value
133+
)
108134

109135
override fun encodeBooleanElement(descriptor: SerialDescriptor, index: Int, value: Boolean) = set(descriptor, index, value)
110136

111137
override fun encodeByteElement(descriptor: SerialDescriptor, index: Int, value: Byte) = set(descriptor, index, value)
112138

113139
override fun encodeCharElement(descriptor: SerialDescriptor, index: Int, value: Char) = set(descriptor, index, value)
114140

115-
override fun encodeDoubleElement(descriptor: SerialDescriptor, index: Int, value: Double) = set(descriptor, index, encodeTimestamp(value))
141+
override fun encodeDoubleElement(descriptor: SerialDescriptor, index: Int, value: Double) = set(descriptor, index, encodeTimestamp(value))
116142

117143
override fun encodeFloatElement(descriptor: SerialDescriptor, index: Int, value: Float) = set(descriptor, index, value)
118144

119145
override fun encodeIntElement(descriptor: SerialDescriptor, index: Int, value: Int) = set(descriptor, index, value)
120146

121147
override fun encodeLongElement(descriptor: SerialDescriptor, index: Int, value: Long) = set(descriptor, index, value)
122148

123-
override fun encodeShortElement(descriptor: SerialDescriptor, index: Int, value: Short) = set(descriptor, index, value)
149+
override fun encodeShortElement(descriptor: SerialDescriptor, index: Int, value: Short) = set(descriptor, index, value)
150+
151+
override fun encodeStringElement(descriptor: SerialDescriptor, index: Int, value: String) = set(descriptor, index, value)
124152

125-
override fun encodeStringElement(descriptor: SerialDescriptor, index: Int, value: String) = set(descriptor, index, value)
153+
@ExperimentalSerializationApi
154+
override fun encodeInlineElement(descriptor: SerialDescriptor, index: Int): Encoder =
155+
FirebaseEncoder(shouldEncodeElementDefault, positiveInfinity)
126156
}
127157

128158

‎firebase-database/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.2.0",
27-
"firebase": "8.2.3",
28-
"kotlin": "1.4.21",
29-
"kotlinx-coroutines-core": "1.4.2"
27+
"firebase": "8.2.10",
28+
"kotlin": "1.4.31",
29+
"kotlinx-coroutines-core": "1.4.3"
3030
}
3131
}

‎firebase-firestore/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = project.property("firebase-firestore.version") as String
99
plugins {
1010
id("com.android.library")
1111
kotlin("multiplatform")
12-
kotlin("plugin.serialization") version "1.4.21"
12+
kotlin("plugin.serialization") version "1.4.31"
1313
}
1414

1515
android {
@@ -104,7 +104,7 @@ kotlin {
104104

105105
val androidMain by getting {
106106
dependencies {
107-
api("com.google.firebase:firebase-firestore:22.1.0")
107+
api("com.google.firebase:firebase-firestore:22.1.1")
108108
}
109109
}
110110

0 commit comments

Comments
 (0)