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

UPDATE_KOTLIN_VERSION: 1.9.30-dev-2548 #1526

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Conversation

neetopia
Copy link
Contributor

@neetopia neetopia commented Sep 7, 2023

first commit is cherry-picked from #1511 with updated commit message to ensure auto-merge works.
while I separated commits for AA and FE1.0, it is worth mentioning that due to the dependency to the kotlinBaseVersion in common-util for testing framework, updating AA version alone will cause unit test run time error due to version mismatch in test utils.

@@ -9,7 +9,7 @@ junit5Version=5.8.2
junitPlatformVersion=1.8.2
googleTruthVersion=1.1

aaKotlinBaseVersion=1.9.30-dev-1098
aaKotlinBaseVersion=1.9.30-dev-2548
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you reword the commit message, so that it can be auto-merged?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

can you elaborate? all 3 commits have same commit message, I tried to run the shell command locally and can have all 3 commits filtered.

Copy link
Collaborator

Choose a reason for hiding this comment

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

The commit for AA should be cherry-picked automatically. With UPDATE_KOTLIN_VERSION in commit message it will be filtered out.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

unfortunately due to the dependency issues in common-util mentioned in the description, AA commit has to be excluded from auto-merge.

Copy link
Collaborator

Choose a reason for hiding this comment

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

KSPAATest in the release branch is redundant. Let's disable it.

Talking about tests, we need to enable KSP 2 in gradle tests and integration tests. Could you update CI to include KSP 2.0 in the matrix in a separate PR?

@neetopia
Copy link
Contributor Author

updated commit message for aa version update commit.

@neetopia neetopia merged commit bfa1c92 into google:main Sep 13, 2023
3 checks passed
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