Skip to content

Another pass at Kotlin Gradle MPP 1.3 #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 25 commits into from
Jan 30, 2019
Merged

Another pass at Kotlin Gradle MPP 1.3 #544

merged 25 commits into from
Jan 30, 2019

Conversation

Egorand
Copy link
Collaborator

@Egorand Egorand commented Dec 23, 2018 •
edited
Loading

Closes #537

@Egorand
Copy link
Collaborator Author

Egorand commented Dec 23, 2018

Relying on the old Gradle plugin is a major roadblock at this point since I guess all tooling updates will be targeting the new plugin from now on. This feels like a lot of work, mainly because of how different the new plugin is, and how limiting it feels when facing non-standard use-cases. Let's use this PR as the central point for the migration efforts, please contribute by targeting this branch.

@Egorand Egorand changed the title Another pass at Kotlin Gradle MPP 1.3 [WIP] Another pass at Kotlin Gradle MPP 1.3 Dec 23, 2018
This was referenced Dec 23, 2018
Closed
Closed
@Egorand
Copy link
Collaborator Author

Egorand commented Dec 23, 2018

Using presets.jvmWithJava doesn't seem to run Java tests for some reason..

@Egorand
Copy link
Collaborator Author

Egorand commented Dec 26, 2018

Interesting, we've got failing Native tests. Reporting seems to be broken in the plugin, so I can only see the tests that failed. Here are the ones that fail on my Mac:

[  FAILED  ] 4 tests, listed below:
[  FAILED  ] okio.CommonByteStringTest.ByteString.decodeBase64WithWhitespace
[  FAILED  ] okio.CommonByteStringTest.ByteString.ignoreUnnecessaryPadding
[  FAILED  ] okio.CommonByteStringTest.OkioEncoder.decodeBase64WithWhitespace
[  FAILED  ] okio.CommonByteStringTest.OkioEncoder.ignoreUnnecessaryPadding

@bnorm
Copy link
Collaborator

bnorm commented Dec 26, 2018 •
edited
Loading

I believe this is because Kotlin/Native changed ByteString to String UTF-8 translation with 1.3. Changing to use our internal UTF-8 translation for Kotlin/Native like Kotlin/JS in -Platform.kt fixes the failing native unit tests.

See #545

@Egorand
Copy link
Collaborator Author

Egorand commented Jan 7, 2019

Shelving this until 1.3.20, looks like the DSL will change.

@Egorand Egorand force-pushed the egorand/181222/kotlin-gradle-mpp-1.3 branch from 00af041 to cc46fec Compare January 26, 2019 03:54
@Egorand
Copy link
Collaborator Author

Egorand commented Jan 26, 2019

The publishing setup I ended up with actually publishes artifacts for all supported platforms. I can figure out how to disable this, but I'd be curious to try the current setup against a few multiplatform samples.

@Egorand
Copy link
Collaborator Author

Egorand commented Jan 27, 2019

I think this is ready for testing! Would love some help in making sure I haven't missed anything and everything is still being built, tested and published properly.

bnorm
bnorm approved these changes Jan 29, 2019
View reviewed changes
Copy link
Collaborator

@bnorm bnorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built this on a Windows and Fedora machine I have access to. Both were successful.

swankjesse
swankjesse approved these changes Jan 29, 2019
View reviewed changes
@swankjesse swankjesse merged commit 0078fca into master Jan 30, 2019
@Egorand Egorand changed the title [WIP] Another pass at Kotlin Gradle MPP 1.3 Another pass at Kotlin Gradle MPP 1.3 Jan 30, 2019
@Egorand Egorand deleted the egorand/181222/kotlin-gradle-mpp-1.3 branch January 30, 2019 15:09
15characterlimi pushed a commit to 15characterlimi/okio that referenced this pull request Nov 9, 2020
@15characterlimi
Kotlin Gradle MPP 1.3 (square#544)
696ae83 
* Basic setup

* Ignore failing test

* Gradle 5.0

* Better native config

* Fix jvm tests

* JS testing setup

* Native config

* Use EAP dependencies

* Japicmp setup

* Correct path to japicmp report

* Basic JVM + AnimalSniffer setup

* Enable samples module

* Use jvmWithJava for running Java tests

* Include more Native platforms to force test task generation

* Use internal UTF-8 decoder for Kotlin/Native

* Kotlin 1.3.20

* Gradle 5.1

* Move JMH setup into a separate module

* Properly configure jmhJar task

* Remove old jvm build.gradle

* Replace publishing plugin with SQLDelight's custom script

* Use default artifactId for JVM target

* Revert JVM build.gradle rename, use new DSL for defining targets

* Remove old module definitions in settings

* Feedback fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@swankjesse swankjesse swankjesse approved these changes

@bnorm bnorm bnorm approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Egorand @bnorm @swankjesse