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.

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

Update Kotlin to 1.8. #855

Merged
merged 48 commits into from
Jan 20, 2023
Merged

Update Kotlin to 1.8. #855

merged 48 commits into from
Jan 20, 2023

Conversation

colinrtwhite
Copy link
Collaborator

@colinrtwhite colinrtwhite commented Jan 16, 2023 •
edited

Resolves: #834

Blocked by:

  • A 1.8-compatible SqlDelight version is released. The branch currently uses a snapshot release. It seems like this commit is necessary to support 1.8 - hopefully it's backported to the 1.5 branch.
  • A 1.8-compatible Compose compiler version is released. This branch currently uses a snapshot release. This maybe isn't necessary since the compiler is only used in the sample app.

Tested this branch with the world clock sample and everything works!

JakeWharton
JakeWharton reviewed Jan 16, 2023
View reviewed changes
Copy link
Member

@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.

Looks good. Maybe in the time between now and our requirements for this merging being met we can try to fix some the FIR incompatibilities. I assume it's mostly our heavy use of FqName and APIs which take an FqName?

@colinrtwhite
Copy link
Collaborator Author

@JakeWharton Yep, it's all due to using the FqName overloads of referenceClass/referenceFunction/referenceProperty. Seems like migrating to the ClassId/CallableId overloads of those functions solves it.

Base automatically changed from colin/gradle_cleanup to trunk January 17, 2023 02:16
@JakeWharton JakeWharton mentioned this pull request Jan 17, 2023
Closed
1 task
@JakeWharton JakeWharton mentioned this pull request Jan 17, 2023
Closed
3 tasks
@colinrtwhite
Copy link
Collaborator Author

Tests pass! Okay, this is good to go once SqlDelight has a release that supports Kotlin 1.8.

@colinrtwhite
Merge branch 'trunk' into colin/kotlin18
b3b226a 
* trunk:
  Address feedback
  Support Webpack builds
  Update dependency com.vanniktech:gradle-maven-publish-plugin to v0.23.2
  Enable automatic releasing (#858)
@colinrtwhite
Revert "Use SqlDelight alpha."
d5fe13b 
This reverts commit d52a848.
@colinrtwhite
Revert "Update SqlDelight to 2.0.0-alpha04."
a54ff5d 
This reverts commit c75474d.
@JakeWharton JakeWharton mentioned this pull request Jan 20, 2023
Merged
1 task
@colinrtwhite colinrtwhite marked this pull request as ready for review January 20, 2023 19:06
JakeWharton
JakeWharton approved these changes Jan 20, 2023
View reviewed changes
Copy link
Member

@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.

excellent

samples/build.gradle.kts Outdated Show resolved Hide resolved
samples/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/signing/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/signing/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/multipleJsTargets/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/multipleJsTargets/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/jvmOnly/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/jvmOnly/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/basic/build.gradle.kts Outdated Show resolved Hide resolved
zipline-gradle-plugin/src/test/projects/basic/build.gradle.kts Outdated Show resolved Hide resolved
colinrtwhite and others added 10 commits January 20, 2023 11:19
@colinrtwhite @JakeWharton
Update samples/build.gradle.kts
b327ee8 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update samples/build.gradle.kts
7fe1072 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/signing/build.gradle.kts
139aae5 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/signing/build.gradle.kts
d7a192b 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/multipleJsTargets/buil…
8f04236 
…d.gradle.kts

Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/multipleJsTargets/buil…
ff19d97 
…d.gradle.kts

Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/jvmOnly/build.gradle.kts
8c7eb93 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/jvmOnly/build.gradle.kts
64f1fdc 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/basic/build.gradle.kts
a1b435a 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite @JakeWharton
Update zipline-gradle-plugin/src/test/projects/basic/build.gradle.kts
0ddca73 
Co-authored-by: Jake Wharton <jw@squareup.com>
@colinrtwhite colinrtwhite enabled auto-merge (squash) January 20, 2023 19:22
@colinrtwhite colinrtwhite merged commit 43775e7 into trunk Jan 20, 2023
@colinrtwhite colinrtwhite deleted the colin/kotlin18 branch January 20, 2023 20:50
colinrtwhite added a commit that referenced this pull request Jan 24, 2023
@colinrtwhite
Revert "Update Kotlin to 1.8. (#855)"
e94cb06 
This reverts commit 43775e7.
colinrtwhite added a commit that referenced this pull request Jan 25, 2023
@colinrtwhite
Revert back to Kotlin 1.7.20. (#869)
ff311c4 
* Revert "Replace deprecated property. (#868)"

This reverts commit 1c98e9c.

* Revert "Update okio to v3.3.0 (#840)"

This reverts commit fdf330d.

* Revert "Update Kotlin to 1.8. (#855)"

This reverts commit 43775e7.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JakeWharton JakeWharton JakeWharton approved these changes

@swankjesse swankjesse Awaiting requested review from swankjesse

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Kotlin 1.8-compatible release
2 participants
@colinrtwhite @JakeWharton