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 K2. #1212

Merged
merged 25 commits into from
Jan 16, 2024
Merged

Support K2. #1212

merged 25 commits into from
Jan 16, 2024

Conversation

colinrtwhite
Copy link
Member

@colinrtwhite colinrtwhite commented Jan 4, 2024

Took a quick pass at supporting K2. It might be possible to support both K2 and K1 if that's something we want to do. Else, we could wait to make these changes until K2 is released.

Updated so we can support both K1 and K2. This PR also contains a couple smaller changes that aren't strictly necessary unless we're also compiling Zipline with K2. Can revert if preferred.

* trunk:
  Prepare next development version
  Prepare version 1.8.0
  Clarify the docs on ZiplineLoader.load() (#1223)
  Fix doc comment for DefaultFreshnessCheckerNotFresh (#1220)
  EventListener.manifestReady (#1221)
  Update dependency androidx.lifecycle:lifecycle-runtime-ktx to v2.7.0 (#1218)
  Update dependency com.github.ajalt.clikt:clikt to v4.2.2 (#1214)
  Update dependency com.vanniktech:gradle-maven-publish-plugin to v0.27.0 (#1213)
* trunk:
  Track changes to upload-artifact@v4
* trunk:
  Update plugin spotless to v6.24.0 (#1225)
@@ -174,3 +174,5 @@ actual class QuickJs private constructor(
private external fun gc(context: Long)
private external fun setMaxStackSize(context: Long, stackSize: Long)
}

internal expect fun loadNativeLibrary()
Copy link
Member Author

Choose a reason for hiding this comment

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

This expect declaration is only necessary if we're compiling the zipline runtime with K2 (which won't happen until Kotlin 2.0.0) - can revert if preferred.

@colinrtwhite colinrtwhite marked this pull request as ready for review January 15, 2024 11:56
Copy link
Collaborator

@JakeWharton JakeWharton left a comment

Choose a reason for hiding this comment

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

Sweet

Co-authored-by: Jake Wharton <[email protected]>
@colinrtwhite colinrtwhite merged commit cdf5dfc into trunk Jan 16, 2024
6 checks passed
@colinrtwhite colinrtwhite deleted the colin/k2 branch January 16, 2024 21:10
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