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

Kotlin 1.4 #374

Merged
merged 10 commits into from
Oct 13, 2020
Merged

Kotlin 1.4 #374

merged 10 commits into from
Oct 13, 2020

Conversation

dinomite
Copy link
Member

No description provided.

daviddenton and others added 3 commits September 20, 2020 14:15
Co-authored-by: Selim <64888483+slm-ioki@users.noreply.github.com>
 Conflicts:
	.travis.yml
@dinomite dinomite mentioned this pull request Sep 20, 2020
@dinomite dinomite added the 2.12 label Sep 22, 2020
@dinomite dinomite added this to the 2.12.0 milestone Sep 22, 2020
@dinomite dinomite removed the 2.12 label Sep 22, 2020
@dinomite
Copy link
Member Author

@cowtowncoder I noticed you did the first RC build for 2.12—I'd like to get j-m-k onto current Kotlin (1.4.10), would it be too late to merge this into 2.12?

@cowtowncoder
Copy link
Member

@dinomite Not at all -- I added a not on an issue, we'll have at least 3 weeks to get 2.12.0 done.
It is even possible we might want to do 2.12.0-rc2 first; I have already received 2 reports for regressions I will have to address.

@dinomite
Copy link
Member Author

@cowtowncoder Great, I'll get this failing test moved to the failing directory (hopefully we can fix it in #356) and get this branch merged into 2.12.

@dinomite dinomite merged commit 4a91e3a into 2.12 Oct 13, 2020
@dinomite dinomite deleted the kotlin-1.4 branch October 13, 2020 15:05
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.

3 participants