Skip to content

Commit 57e3a9e

Browse files
committed
Remove all jvm references
1 parent 69049ec commit 57e3a9e

File tree

7 files changed

+4
-88
lines changed

7 files changed

+4
-88
lines changed

build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,17 @@ subprojects {
125125
mkdir("$buildDir/node_module")
126126
}
127127
}
128-
129-
val buildTask = project.tasks.names.find{
130-
it.equals("build")
131-
}
132-
128+
133129
if(!File(rootDir, "Firebase").exists()) {
134130
dependsOn(
135131
rootProject.tasks.named("copyAllFirebaseFrameworks").get(),
136-
buildTask,
137132
copyPackageJson,
138133
copyJS,
139134
copySourceMap,
140135
copyReadMe
141136
)
142137
} else {
143138
dependsOn(
144-
buildTask,
145139
copyPackageJson,
146140
copyJS,
147141
copySourceMap,
@@ -171,10 +165,6 @@ subprojects {
171165
"jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.4")
172166
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
173167
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.4")
174-
"jvmMainImplementation"(kotlin("stdlib-jdk8"))
175-
"jvmMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
176-
"jvmMainApi"("dev.gitlive:firebase-java:0.3.1")
177-
"jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.4")
178168
"iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
179169
"iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.4")
180170
}

firebase-app/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ kotlin {
4646
android {
4747
publishLibraryVariants("release", "debug")
4848
}
49-
jvm {
50-
val main by compilations.getting {
51-
kotlinOptions {
52-
jvmTarget = "1.8"
53-
}
54-
}
55-
}
5649

5750
val iosArm64 = iosArm64()
5851
val iosX64 = iosX64("ios")
@@ -68,9 +61,6 @@ kotlin {
6861
api("com.google.firebase:firebase-common:19.2.0")
6962
}
7063
}
71-
val jvmMain by getting {
72-
kotlin.srcDir("src/androidMain/kotlin")
73-
}
7464
// val iosMain by creating
7565

7666
configure(listOf(iosArm64, iosX64)) {

firebase-auth/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ kotlin {
3434
}
3535
val iosArm64 = iosArm64()
3636
val iosX64 = iosX64("ios")
37-
jvm {
38-
val main by compilations.getting {
39-
kotlinOptions {
40-
jvmTarget = "1.8"
41-
}
42-
}
43-
}
4437

4538
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
4639
kotlinOptions.freeCompilerArgs += listOf(
@@ -63,10 +56,7 @@ kotlin {
6356
}
6457
}
6558
// val iosMain by creating
66-
val jvmMain by getting {
67-
kotlin.srcDir("src/androidMain/kotlin")
68-
}
69-
59+
7060
configure(listOf(iosArm64, iosX64)) {
7161
compilations.getByName("main") {
7262
source(sourceSets.get("iosMain"))

firebase-common/build.gradle.kts

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,6 @@ kotlin {
4444
val iosArm64 = iosArm64()
4545
val iosX64 = iosX64("ios")
4646

47-
jvm {
48-
val main by compilations.getting {
49-
kotlinOptions {
50-
jvmTarget = "1.8"
51-
}
52-
}
53-
val test by compilations.getting {
54-
kotlinOptions {
55-
jvmTarget = "1.8"
56-
}
57-
}
58-
}
59-
6047
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
6148
kotlinOptions.freeCompilerArgs += listOf(
6249
"-Xuse-experimental=kotlin.Experimental",
@@ -83,18 +70,6 @@ kotlin {
8370
api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
8471
}
8572
}
86-
val jvmMain by getting {
87-
dependencies {
88-
api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
89-
}
90-
kotlin.srcDir("src/androidMain/kotlin")
91-
}
92-
val jvmTest by getting {
93-
dependencies {
94-
implementation(kotlin("test-junit"))
95-
}
96-
kotlin.srcDir("src/androidTest/kotlin")
97-
}
9873
val iosMain by getting {
9974
dependencies {
10075
api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
@@ -108,7 +83,7 @@ kotlin {
10883

10984
cocoapods {
11085
summary = "Firebase Core for iOS (plus community support for macOS and tvOS)"
111-
homepage = "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk"
86+
homepage = "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk"
11287
//pod("FirebaseCore", "~> 6.3.1")
11388
}
11489
}

firebase-database/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ kotlin {
3232
android {
3333
publishLibraryVariants("release", "debug")
3434
}
35-
jvm {
36-
val main by compilations.getting {
37-
kotlinOptions {
38-
jvmTarget = "1.8"
39-
}
40-
}
41-
}
4235
val iosArm64 = iosArm64()
4336
val iosX64 = iosX64("ios")
4437

@@ -62,9 +55,6 @@ kotlin {
6255
api("com.google.firebase:firebase-database:17.0.0")
6356
}
6457
}
65-
val jvmMain by getting {
66-
kotlin.srcDir("src/androidMain/kotlin")
67-
}
6858
val jsMain by getting {}
6959
val iosMain by getting {}
7060

firebase-firestore/build.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ kotlin {
3434
}
3535
val iosArm64 = iosArm64()
3636
val iosX64 = iosX64("ios")
37-
jvm {
38-
val main by compilations.getting {
39-
kotlinOptions {
40-
jvmTarget = "1.8"
41-
}
42-
}
43-
}
4437

4538
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
4639
kotlinOptions.freeCompilerArgs += listOf(
@@ -62,9 +55,7 @@ kotlin {
6255
api("com.google.firebase:firebase-firestore:19.0.2")
6356
}
6457
}
65-
val jvmMain by getting {
66-
kotlin.srcDir("src/androidMain/kotlin")
67-
}
58+
6859
val jsMain by getting {}
6960
val iosMain by getting {}
7061

firebase-functions/build.gradle.kts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ kotlin {
3434
}
3535
val iosArm64 = iosArm64()
3636
val iosX64 = iosX64("ios")
37-
jvm {
38-
val main by compilations.getting {
39-
kotlinOptions {
40-
jvmTarget = "1.8"
41-
}
42-
}
43-
}
4437

4538
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
4639
kotlinOptions.freeCompilerArgs += listOf(
@@ -62,9 +55,6 @@ kotlin {
6255
api("com.google.firebase:firebase-functions:19.0.1")
6356
}
6457
}
65-
val jvmMain by getting {
66-
kotlin.srcDir("src/androidMain/kotlin")
67-
}
6858
val iosMain by getting {}
6959
val jsMain by getting {}
7060

0 commit comments

Comments
 (0)