Skip to content

Commit

Permalink
Removing all JS variants (#8145)
Browse files Browse the repository at this point in the history
  • Loading branch information
oldergod authored Dec 18, 2023
1 parent 6185d47 commit 68105a4
Show file tree
Hide file tree
Showing 31 changed files with 1 addition and 2,159 deletions.
37 changes: 1 addition & 36 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Run Checks
uses: gradle/gradle-build-action@v2
with:
arguments: check -PandroidBuild=true -PgraalBuild=true -x test -x jvmTest -x jsTest
arguments: check -PandroidBuild=true -PgraalBuild=true -x test -x jvmTest

testopenjdk11:
permissions:
Expand Down Expand Up @@ -117,41 +117,6 @@ jobs:
report_paths: '**/build/test-results/*/TEST-*.xml'
check_name: OpenJDK 11 Test Report

testjs:
permissions:
checks: write # for mikepenz/action-junit-report
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Configure JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11

- name: Configure JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17

- name: Run Checks
uses: gradle/gradle-build-action@v2
with:
arguments: jsTest

- name: Publish Test Report
if: success() || failure()
uses: mikepenz/action-junit-report@v4
with:
report_paths: '**/build/test-results/test/TEST-*.xml'
check_name: JS Test Report

testzulu11:
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'zulu')
Expand Down
19 changes: 0 additions & 19 deletions buildSrc/src/main/kotlin/deps.kt

This file was deleted.

1 change: 0 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,3 @@ squareup-okhttp-icu = "com.squareup.okhttpicu:okhttp-icu:0.2.0"
squareup-kotlinPoet = "com.squareup:kotlinpoet:1.15.2"
squareup-okio = { module = "com.squareup.okio:okio", version.ref = "com-squareup-okio" }
squareup-okio-fakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version.ref = "com-squareup-okio" }
squareup-okio-nodefilesystem = { module = "com.squareup.okio:okio-nodefilesystem", version.ref = "com-squareup-okio" }
1 change: 0 additions & 1 deletion okcurl/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.KotlinMultiplatform
import org.apache.tools.ant.taskdefs.condition.Os
Expand Down
48 changes: 0 additions & 48 deletions okhttp-coroutines/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,6 @@ kotlin {
jvm {
withJava()
}
if (kmpJsEnabled) {
js {
compilations.all {
kotlinOptions {
moduleKind = "umd"
sourceMap = true
metaInfo = true
}
}
nodejs {
testTask {
useMocha {
timeout = "30s"
}
}
}
browser {
}
}
}

sourceSets {
commonMain {
Expand All @@ -48,18 +28,6 @@ kotlin {
api(libs.assertk)
}
}
val nonJvmMain = create("nonJvmMain") {
dependencies {
dependsOn(sourceSets.commonMain.get())
api(projects.okhttp)
implementation(libs.kotlinx.coroutines.core)
}
}
val nonJvmTest = create("nonJvmTest") {
dependencies {
dependsOn(sourceSets.commonTest.get())
}
}

getByName("jvmMain") {
dependencies {
Expand All @@ -74,22 +42,6 @@ kotlin {
implementation(libs.kotlinx.coroutines.test)
implementation(projects.mockwebserver3Junit5)
}

getByName("jsMain") {
dependencies {
dependsOn(nonJvmMain)
api(projects.okhttp)
api(libs.squareup.okio)
api(libs.kotlin.stdlib)
}
}

getByName("jsTest") {
dependencies {
dependsOn(nonJvmTest)
implementation(libs.kotlin.test.js)
}
}
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions okhttp-testing-support/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,13 @@ kotlin {
jvm {
withJava()
}
if (kmpJsEnabled) {
js(IR) {
nodejs()
}
}

sourceSets {
val commonMain by getting {
dependencies {
api(libs.squareup.okio)
}
}
val jsMain by getting {
dependencies {
implementation(libs.squareup.okio.nodefilesystem)
}
}
val jvmMain by getting {
dependencies {
api(projects.okhttp)
Expand Down
25 changes: 0 additions & 25 deletions okhttp-testing-support/src/jsMain/kotlin/okhttp3/TestUtilJs.kt

This file was deleted.

46 changes: 0 additions & 46 deletions okhttp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,6 @@ kotlin {
jvm {
withJava()
}
if (kmpJsEnabled) {
js(IR) {
compilations.all {
kotlinOptions {
moduleKind = "umd"
sourceMap = true
metaInfo = true
}
}
nodejs {
testTask {
useMocha {
timeout = "30s"
}
}
}
}
}

sourceSets {
commonMain {
Expand All @@ -75,18 +57,6 @@ kotlin {
implementation(libs.kotlinx.serialization.json)
}
}
val nonJvmMain = create("nonJvmMain") {
dependencies {
dependsOn(sourceSets.commonMain.get())
implementation(libs.kotlinx.coroutines.core)
implementation(libs.squareup.okhttp.icu)
}
}
val nonJvmTest = create("nonJvmTest") {
dependencies {
dependsOn(sourceSets.commonTest.get())
}
}

getByName("jvmMain") {
dependencies {
Expand Down Expand Up @@ -137,22 +107,6 @@ kotlin {
compileOnly(libs.findbugs.jsr305)
}
}

getByName("jsMain") {
dependencies {
dependsOn(nonJvmMain)
api(libs.squareup.okio)
api(libs.kotlin.stdlib)
}
}

getByName("jsTest") {
dependencies {
dependsOn(nonJvmTest)
implementation(libs.kotlin.test.js)
implementation(libs.kotlinx.coroutines.test)
}
}
}
}

Expand Down
49 changes: 0 additions & 49 deletions okhttp/src/jsMain/kotlin/okhttp3/internal/-JsAsync.kt

This file was deleted.

30 changes: 0 additions & 30 deletions okhttp/src/jsTest/kotlin/okhttp3/HeadersJsTest.kt

This file was deleted.

45 changes: 0 additions & 45 deletions okhttp/src/jsTest/kotlin/okhttp3/MediaTypeJsTest.kt

This file was deleted.

Loading

0 comments on commit 68105a4

Please sign in to comment.