Skip to content
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.

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

Support Kotlin 1.4 #92

Merged
merged 25 commits into from
Aug 5, 2020
Merged

Support Kotlin 1.4 #92

merged 25 commits into from
Aug 5, 2020

Conversation

erikc5000
Copy link
Owner

Creating a PR to run the tests on CI in preparation for a release based on 1.4-M3. This one will sit around until Kotlin 1.4 is finalized.

erikc5000 and others added 25 commits June 30, 2020 08:31
# Conflicts:
#	buildSrc/src/main/kotlin/Dependencies.kt
# Conflicts:
#	buildSrc/src/main/kotlin/Dependencies.kt
#	buildSrc/src/main/kotlin/multiplatform-library.gradle.kts
#	core/build.gradle.kts
# Conflicts:
#	extensions/threetenabp/build.gradle.kts
@erikc5000
Copy link
Owner Author

Kotlin 1.4 is API stable in 1.4-rc and Island Time 0.3.0 will be based on it, so merging it in.

@erikc5000 erikc5000 merged commit 183f885 into master Aug 5, 2020
@erikc5000 erikc5000 deleted the kotlin-1.4 branch August 5, 2020 16:28
erikc5000 added a commit that referenced this pull request Aug 16, 2020
* Build with Kotlin 1.4-M2

* Remove workarounds that should no longer be needed

* Update to Kotlin 1.4-M3

* Revert removal of IDEA hack

* Enable MPP compatibility mode

* Prepare for 0.2.3-1.4-M3 release

* Restore AtomicFU runtime dependency

* Work around Kotlin 1.4 compiler error

* Prepare for 0.2.4-1.4-M3 release

* Prepare for next release

* Bump Kotlin to 1.4.0-rc

* Prepare for 0.2.4-1.4-rc release

* Prepare for next release

* Remove "-1.4-rc" from SNAPSHOT version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant