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

chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.… #1379

Merged
merged 6 commits into from
Oct 23, 2023

Conversation

drstrangelooker
Copy link
Collaborator

@drstrangelooker drstrangelooker commented Oct 12, 2023

…1 to v8.3 and upgraded linter (#1343)

  • chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1 to v8.3 and upgraded linter

  • chore(deps): upgraded kotlin linter formatted code

  • chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1 to v8.3 and upgraded linter

adding foojay-resolver-convention gradle plugin

  • chore(deps): Updated Kotlin from v1.7.0 to v1.9.10, Gradle from v6.7.1 to v8.3 and upgraded linter

setting gradle jvm toolchain version from 8 to 17

  • chore(deps): upgraded kotlin linter formatted code

from #1343

@google-cla
Copy link

google-cla bot commented Oct 12, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@drstrangelooker
Copy link
Collaborator Author

@daniel-lopes-optimizely Can you fill out the cla agreement at https://cla.developers.google.com/? Thanks.

@drstrangelooker
Copy link
Collaborator Author

When @daniel-lopes-optimizely does the cla agreement we can rerun the cla/google check and we should be good to go.

@daniel-lopes-optimizely
Copy link
Contributor

@drstrangelooker I've already signed a CLA through my employer and the check was working previously for me.

Looking at the failing check my author email isn't there anymore, it was replaced by the github reply email in the Merge commit.

@daniel-lopes-optimizely
Copy link
Contributor

daniel-lopes-optimizely commented Oct 12, 2023

@drstrangelooker I've fixed the merge commit author on my branch, should work now.

@drstrangelooker
Copy link
Collaborator Author

@daniel-lopes-optimizely I went to my local branch and did git commit --amend --no-edit --author "Daniel Lopes <snipped email>"

Then I pushed the amended commit.

@drstrangelooker
Copy link
Collaborator Author

@tjbanghart ready for review

@daniel-lopes-optimizely
Copy link
Contributor

hi @tjbanghart @drstrangelooker can we get this merged?

@drstrangelooker
Copy link
Collaborator Author

I'm reverting another change that hit main, then I'll get this merged.

@drstrangelooker
Copy link
Collaborator Author

@tjbanghart @daniel-lopes-optimizely Can you resolve these conflicts? Most are trivial but kotlin/src/main/com/looker/rtl/Transport.kt is non-trivial.

@daniel-lopes-optimizely
Copy link
Contributor

@drstrangelooker @tjbanghart I've updated my branch with the latest changes from main

@drstrangelooker
Copy link
Collaborator Author

@tjbanghart I got the new changes from @daniel-lopes-optimizely. Can you review please?

kotlin/build.gradle.kts Show resolved Hide resolved
@drstrangelooker drstrangelooker merged commit 6897bb7 into main Oct 23, 2023
11 checks passed
@drstrangelooker drstrangelooker deleted the kotlin-gradle-upgrade branch October 23, 2023 17:03
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.

None yet

3 participants