Experiment with splitting okhttp core into Android and JVM #8600
+309
−191
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It's noisier because something is persistently picking up the main source set in the android build, and warning about it. Worse it makes builds fail because of duplicate sources. |
|
Also more invasive because a lot is changing here, so building this against 1.9.24 and AGP 8.2 sounds like a dead end. |
yschimke
commented
Dec 1, 2024
build.gradle.kts
Outdated
| apply(plugin = "org.jetbrains.dokka") | ||
| apply(plugin = "com.diffplug.spotless") | ||
| //apply(plugin = "org.jetbrains.dokka") | ||
| //apply(plugin = "com.diffplug.spotless") |
There was a problem hiding this comment.
Disabled because of Gradle Sync issues when enabled.
yschimke
commented
Dec 1, 2024
swankjesse
reviewed
Dec 4, 2024
okhttp/build.gradle.kts
Outdated
| kotlin("plugin.serialization") | ||
| id("org.jetbrains.dokka") | ||
| id("com.vanniktech.maven.publish.base") | ||
| // id("com.vanniktech.maven.publish.base") |
swankjesse
reviewed
Dec 4, 2024
| @@ -360,15 +360,17 @@ class TaskFaker : Closeable { | |||
| timeout: Long, | |||
| unit: TimeUnit, | |||
| ): T? { | |||
| taskRunner.withLock { | |||
| return taskRunner.withLock { | |||
There was a problem hiding this comment.
what’s with this change?
There was a problem hiding this comment.
Kotlin 2 didn't like the inline with return?
swankjesse
reviewed
Dec 4, 2024
| } | ||
| //animalsniffer { | ||
| // isIgnoreFailures = true | ||
| //} |
swankjesse
reviewed
Dec 4, 2024
build.gradle.kts
Outdated
| // tasks.withType<JavaCompile> { | ||
| // sourceCompatibility = JavaVersion.VERSION_17.toString() | ||
| // targetCompatibility = JavaVersion.VERSION_17.toString() | ||
| // } |
swankjesse
approved these changes
Dec 4, 2024
Merged
yschimke
force-pushed
the
multiplatform_android
branch
from
14cf0c7 to
7ea2b89
Compare
|
@swankjesse not sure how to avoid plugins that pull in java? |
# Conflicts: # build.gradle.kts # native-image-tests/build.gradle.kts # okcurl/build.gradle.kts # okcurl/src/main/kotlin/okhttp3/curl/Main.kt # okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/native-image.properties
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uses this approach for a shared Java core between Android and JVM.
https://jeroenmols.com/blog/2021/03/17/share-code-kotlin-multiplatform/
Source structure under okhttp
Outputs
TODO