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

Bump AGP to 8.0.2 #8146

Merged
merged 1 commit into from
Jul 9, 2023
Merged

Bump AGP to 8.0.2 #8146

merged 1 commit into from
Jul 9, 2023

Conversation

utzcoz
Copy link
Member

@utzcoz utzcoz commented Apr 15, 2023

It needs Gradle 8.0+, so this CL bumps Gradle to the latest stable version 8.1.

The AGP 8.0.0 and Gradle 8.0+ needs JDK 17+, so this CL bumps JDK to 17 for documentation and CI jobs.

@utzcoz utzcoz marked this pull request as draft April 15, 2023 08:36
@utzcoz
Copy link
Member Author

utzcoz commented Apr 15, 2023

  • What went wrong:
    Execution failed for task ':integration_tests:androidx:processDebugManifest'.
    A failure occurred while executing com.android.build.gradle.tasks.ProcessLibraryManifest$ProcessLibWorkAction
    Incorrect package="org.robolectric.integration.axt" found in source AndroidManifest.xml: /home/runner/work/robolectric/robolectric/integration_tests/androidx/src/main/AndroidManifest.xml.
    Setting the namespace via the package attribute in the source AndroidManifest.xml is no longer supported.
    Recommendation: remove package="org.robolectric.integration.axt" from the source AndroidManifest.xml: /home/runner/work/robolectric/robolectric/integration_tests/androidx/src/main/AndroidManifest.xml.

I want to remove android:package from AndroidManifest.xml, but I think it might breaks the Google's internal test suites. @hoisie @brettchabot are there any solutions to make it compatible?

@utzcoz utzcoz mentioned this pull request Apr 25, 2023
Closed
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 5 times, most recently from bf01861 to c091d19 Compare May 2, 2023 13:58
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 3 times, most recently from 87fca2a to b7335b9 Compare May 24, 2023 14:36
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 3 times, most recently from 6926895 to d48351a Compare June 3, 2023 03:11
@utzcoz utzcoz changed the title Bump AGP to 8.0.0 Bump AGP to 8.0.2 Jun 3, 2023
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 3 times, most recently from 8392f6d to ae1bcf5 Compare June 3, 2023 04:41
@utzcoz utzcoz requested a review from hoisie June 3, 2023 06:03
@utzcoz
Copy link
Member Author

utzcoz commented Jun 3, 2023

@hoisie I make CI pass finally. But I can't run GMD locally because R8 OutOfMemory. Some tests are failed with running with JDK17 + AGP 8.x. So I decide to split some changes to other MRs, and merge these safe things first. After that, I will come back to try to fix failed tests instead of current ignore.

@utzcoz utzcoz mentioned this pull request Jun 3, 2023
Merged
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 6 times, most recently from 37359d4 to 098aaea Compare June 4, 2023 05:56
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 2 times, most recently from 262e113 to 332a282 Compare July 1, 2023 03:36
@utzcoz utzcoz force-pushed the bump-AGP-to-8.0.0 branch 2 times, most recently from 3bae3d1 to 2a296a6 Compare July 1, 2023 10:59
@utzcoz utzcoz marked this pull request as ready for review July 6, 2023 12:04
@utzcoz
Copy link
Member Author

utzcoz commented Jul 6, 2023

@hoisie Almost of the origin PR has been splited and merged into master now. But this PR still keeps the content to remove package name from AndroidManifest.xml to make AGp 8.x happy. But I am afraid that it causes internal porting difficult. Could you help to review this PR and check whether current modifications are fine?

@utzcoz
Copy link
Member Author

utzcoz commented Jul 6, 2023

I have a plan to merge this PR this weekend if everything goes well.

@utzcoz
Bump AGP to 8.0.2
15c4197 
It needs Gradle 8.0+, so this CL bumps Gradle to the latest stable
version 8.1.

The AGP 8.0.2 and Gradle 8.0+ needs JDK 17+, so this CL bumps JDK to 17
for documentation and CI jobs.

Signed-off-by: utzcoz <utzcoz@outlook.com>
@utzcoz
Copy link
Member Author

utzcoz commented Jul 9, 2023

@hoisie After some thoughts, I think it's not avoidable to enter JDK17 and AGP 8.x age, so I decide to merge it first, and let me know if you have other considerations.

@utzcoz utzcoz merged commit 5a8727d into robolectric:master Jul 9, 2023
18 checks passed
@utzcoz utzcoz deleted the bump-AGP-to-8.0.0 branch July 9, 2023 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hoisie hoisie Awaiting requested review from hoisie

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

Successfully merging this pull request may close these issues.

None yet
1 participant
@utzcoz