Skip to content

Commit 76445e7

Browse files
committed
Fix test-utils
1 parent 539aef5 commit 76445e7

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ The Firebase Kotlin SDK uses Kotlin serialization to read and write custom class
6969

7070
```groovy
7171
plugins {
72-
kotlin("multiplatform") version "1.8.20" // or kotlin("jvm") or any other kotlin plugin
73-
kotlin("plugin.serialization") version "1.8.20"
72+
kotlin("multiplatform") version "1.8.21" // or kotlin("jvm") or any other kotlin plugin
73+
kotlin("plugin.serialization") version "1.8.21"
7474
}
7575
```
7676

firebase-database/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("com.android.library")
99
kotlin("native.cocoapods")
1010
kotlin("multiplatform")
11-
kotlin("plugin.serialization") version "1.8.20"
11+
kotlin("plugin.serialization")
1212
}
1313

1414
repositories {

firebase-firestore/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("com.android.library")
99
kotlin("native.cocoapods")
1010
kotlin("multiplatform")
11-
kotlin("plugin.serialization") version "1.8.20"
11+
kotlin("plugin.serialization")
1212
}
1313

1414
android {

test-utils/build.gradle.kts

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,27 @@ version = "0.0.1"
99
plugins {
1010
id("com.android.library")
1111
kotlin("multiplatform")
12-
kotlin("plugin.serialization") version "1.8.20"
12+
kotlin("plugin.serialization")
1313
}
1414

1515
android {
16-
compileSdk = property("targetSdkVersion") as Int
16+
val minSdkVersion: Int by project
17+
val compileSdkVersion: Int by project
18+
19+
compileSdk = compileSdkVersion
20+
namespace = "dev.gitlive.firebase.testUtils"
21+
1722
defaultConfig {
18-
minSdk = property("minSdkVersion") as Int
19-
targetSdk = property("targetSdkVersion") as Int
23+
minSdk = minSdkVersion
2024
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2125
}
22-
sourceSets {
23-
getByName("main") {
24-
manifest.srcFile("src/androidMain/AndroidManifest.xml")
25-
}
26+
27+
compileOptions {
28+
sourceCompatibility = JavaVersion.VERSION_11
29+
targetCompatibility = JavaVersion.VERSION_11
2630
}
27-
packagingOptions {
31+
32+
packaging {
2833
resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
2934
resources.pickFirsts.add("META-INF/AL2.0")
3035
resources.pickFirsts.add("META-INF/LGPL2.1")
@@ -47,7 +52,7 @@ kotlin {
4752
iosSimulatorArm64()
4853
}
4954

50-
js {
55+
js(IR) {
5156
useCommonJs()
5257
nodejs()
5358
browser()
@@ -56,13 +61,15 @@ kotlin {
5661
sourceSets {
5762
all {
5863
languageSettings.apply {
59-
apiVersion = "1.8"
60-
languageVersion = "1.8"
64+
val apiVersion: String by project
65+
val languageVersion: String by project
66+
this.apiVersion = apiVersion
67+
this.languageVersion = languageVersion
6168
progressiveMode = true
6269
}
6370
}
6471

65-
val commonMain by getting {
72+
getByName("commonMain") {
6673
dependencies {
6774
implementation(kotlin("test"))
6875
}
@@ -76,7 +83,5 @@ kotlin {
7683
val iosSimulatorArm64Test by getting
7784
iosSimulatorArm64Test.dependsOn(iosTest)
7885
}
79-
80-
val jsMain by getting
8186
}
8287
}

test-utils/src/androidMain/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)