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

Upgrade to Kotlin 1.9.20 #1158

Merged
merged 9 commits into from
Nov 2, 2023
Merged

Upgrade to Kotlin 1.9.20 #1158

merged 9 commits into from
Nov 2, 2023

Conversation

swankjesse
Copy link
Collaborator

No description provided.

    error: implicit conversion from 'long long' to 'double' changes
           value from 9223372036854775807 to 9223372036854775808
           [-Werror,-Wimplicit-const-int-float-conversion]
                    else if (d > INT64_MAX)
                               ~ ^~~~~~~~~
@@ -202,7 +202,6 @@ public abstract interface class app/cash/zipline/ZiplineFunction {

public final class app/cash/zipline/ZiplineManifest {
public static final field Companion Lapp/cash/zipline/ZiplineManifest$Companion;
public synthetic fun <init> (ILapp/cash/zipline/ZiplineManifest$Unsigned;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Unclear to me what the binary-compatibility consequences are of dropping these synthetic constructors. It would be pretty horrible if code compiled for 1.9.10 crashed when deserializing these!

But I don’t think I have many choices here; this is a deep implementation detail of kotlinx.serialization.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Phew, looks like it’s safe!
Kotlin/kotlinx.serialization#2209

@swankjesse swankjesse marked this pull request as ready for review November 2, 2023 11:41
@@ -78,6 +78,8 @@
#define CONFIG_STACK_CHECK
#endif

/* Zipline-patched for https://github.com/bellard/quickjs/pull/196 */
static double const INT64_MAX_PLUS_ONE_AS_DOUBLE = 9223372036854775808.0;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Details on this one:
bellard/quickjs#196

@@ -1,10 +1,10 @@
[versions]
androidx-compose = "1.5.4"
androidx-compose-compiler = "1.5.2"
androidx-compose-compiler = "1.5.3"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I assume we're blocked waiting for 1.5.4 here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Unsure. This is only needed for the world clock sample.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

> Task :world-clock:android:compileDebugKotlin FAILED
e: This version (1.5.3) of the Compose Compiler requires Kotlin version 1.9.10 but you appear to be using Kotlin version 1.9.20 which is not known to be compatible.  Please consult the Compose-Kotlin compatibility map located at https://developer.android.com/jetpack/androidx/releases/compose-kotlin to choose a compatible version pair (or `suppressKotlinVersionCompatibilityCheck` but don't say I didn't warn you!).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Since it’s just a sample, I’m gonna use the pre-release version.
25bb9cd

@swankjesse swankjesse merged commit 6ff33bb into trunk Nov 2, 2023
6 checks passed
@swankjesse swankjesse deleted the jwilson.1101.kt1920 branch November 2, 2023 15:28
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