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

Android13 QPR2 Dependency & Misc Updates #526

Merged

theimpulson merged 14 commits into seedvault-app:android13 from theimpulson:android13-dependencyUpdates

Aug 4, 2023

Collaborator

theimpulson commented Mar 27, 2023

This PR updates dependencies to the latest release (as per AOSP and Gradle) wherever possible.

theimpulson added the enhancement label

theimpulson requested review from grote and chirayudesai

March 27, 2023 09:34

theimpulson self-assigned this

chirayudesai previously approved these changes

View reviewed changes

Member

chirayudesai left a comment

We could also rebuild android.jar and libcore.jar

build.gradle Show resolved Hide resolved

build.gradle Outdated Show resolved Hide resolved

theimpulson dismissed chirayudesai’s stale review via

f81ca67

March 27, 2023 13:27

theimpulson force-pushed the android13-dependencyUpdates branch from 749d0ad to f81ca67 Compare

March 27, 2023 13:27

theimpulson changed the title ~~Android13 TQ2A Dependency Updates~~ Android13 QPR2Dependency Updates

theimpulson changed the title ~~Android13 QPR2Dependency Updates~~ Android13 QPR2 Dependency Updates

Member

chirayudesai commented Mar 28, 2023

I'd like to do a bit of quick testing with this but otherwise it all looks good.

Collaborator

grote commented Mar 29, 2023

yeah I'd be most worried about the room upgrade to not affect our K/V DB updates.

theimpulson requested a review from chirayudesai

April 4, 2023 15:15

Collaborator Author

theimpulson commented Jul 3, 2023

The libs versions seem to be the same in the latest QPR3

theimpulson added 4 commits

July 3, 2023 23:28


          Bump kotlin to 1.7.20 based on Android 13 QPR2 release

591e9db

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Bump to latest stable AGP and Gradle versions

b7c1459

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Migrate to new plugins and dependency management system

* Ensure every plugin is present in project's plugin block with version
* Switch to full plugin id for jetbrains plugins
* Move plugin and dependency repos to settings

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Set root project's name to Seedvault

1d9cb14

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

theimpulson force-pushed the android13-dependencyUpdates branch from f81ca67 to 4348627 Compare

July 3, 2023 18:00

Collaborator Author

theimpulson commented Jul 3, 2023

Rebased to fix conflicts

grote reviewed

View reviewed changes

storage/lib/Android.bp Show resolved Hide resolved

gradle/dependencies.gradle Outdated Show resolved Hide resolved

theimpulson force-pushed the android13-dependencyUpdates branch from 4348627 to f81f999 Compare

August 2, 2023 15:24

theimpulson requested a review from grote

August 2, 2023 15:27


          Bump dependencies to Android 13 QPR2 release

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

theimpulson force-pushed the android13-dependencyUpdates branch from 73f991f to 07f6654 Compare

August 2, 2023 16:02

theimpulson added 6 commits

August 3, 2023 00:08


          Bump ktlint Gradle plugin to 11.3.1

efee38a

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Switch from -Xopt-in to -opt-in

d532091

w: Argument -Xopt-in is deprecated. Please use -opt-in instead
w: C:\Users\aayus\StudioProjects\seedvault\storage\demo\src\main\java\de\grobox\storagebackuptester\restore\DemoSnapshotFragment.kt: (34, 31): 'onBackPressed(): Unit' is deprecated. Overrides deprecated member in 'androidx.core.app.ComponentActivity'. Deprecated in Java

w: Argument -Xopt-in is deprecated. Please use -opt-in instead
w: C:\Users\aayus\StudioProjects\seedvault\storage\lib\src\main\java\org\calyxos\backup\storage\backup\BackupService.kt: (35, 9): This is a delicate API and its use requires care. Make sure you fully read and understand documentation of the declaration that is marked as a delicate API.
w: C:\Users\aayus\StudioProjects\seedvault\storage\lib\src\main\java\org\calyxos\backup\storage\restore\RestoreService.kt: (49, 9): This is a delicate API and its use requires care. Make sure you fully read and understand documentation of the declaration that is marked as a delicate API.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Drop buildToolsVersion

64ecd5c

If you're using Android plugin for Gradle 3.0.0 or higher, your project automatically uses a default version of the build tools that the plugin specifies

Ref: https://developer.android.com/tools/releases/build-tools

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Sync appropriate protoc artifact for m1

cba065f

Fixes compilation on M1 macOS. Check grpc/grpc-java#7690 for further info

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Switch to new Sdk version properties

b330b7b

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Set appropriate namespace in all modules

8b63a0a

Required by new AGP versions

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>


          Drop packageName from manifests for tests

4a31035

Tests are Gradle-only and keeping this in manifest results in namespace collision
Ref: https://developer.android.com/build/configure-app-module#change-namespace-for-testing

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

theimpulson changed the title ~~Android13 QPR2 Dependency Updates~~ Android13 QPR2 Dependency & Misc Updates

theimpulson force-pushed the android13-dependencyUpdates branch from 07f6654 to d51509a Compare

August 2, 2023 16:53

Collaborator Author

theimpulson commented Aug 2, 2023

Bumped AGP and Gradle to 8.x, ktlint to latest stable version and other changes to accommodate them


          Bump to AGP and Gradle 8.x

6ca1f27

Disable new R8 mode and resource namespacing for now to avoid build failures.
These needs to be worked on before they can be enabled.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

theimpulson force-pushed the android13-dependencyUpdates branch from d51509a to 6ca1f27 Compare

August 2, 2023 16:57


          Update possible github actions

63bfb6b

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

theimpulson force-pushed the android13-dependencyUpdates branch from 4d7daeb to 63bfb6b Compare

August 2, 2023 17:14

Collaborator

grote commented Aug 3, 2023 •

edited

Loading

So this forces me to use JDK 17 and AS Giraffe I guess :/

The project is using an incompatible version (AGP 8.1.0) of the Android Gradle plugin. Latest supported version is AGP 8.0.2

Collaborator

grote commented Aug 3, 2023

So after upgrading my local setup, building it and running tests works here. However, there's an issue with the gradle build light theme where the action bar is all black including the text.

grote approved these changes

View reviewed changes

Collaborator Author

theimpulson commented Aug 3, 2023

So after upgrading my local setup, building it and running tests works here. However, there's an issue with the gradle build light theme where the action bar is all black including the text.

@grote it seems to be unrelated to this MR. I tried looking and it seems the aforementioned issue is coming from the fact that colors defined for light theme here are using system colors while dark theme colors here simply use a properly defined color. I am unsure why it was done that way but maybe we can handle that in a different MR?

theimpulson mentioned this pull request

Have some integration tests for K/V backups with room #548

Open

Collaborator Author

theimpulson commented Aug 3, 2023 •

edited

Loading

So after upgrading my local setup, building it and running tests works here. However, there's an issue with the gradle build light theme where the action bar is all black including the text.

@grote it seems to be unrelated to this MR. I tried looking and it seems the aforementioned issue is coming from the fact that colors defined for light theme here are using system colors while dark theme colors here simply use a properly defined color. I am unsure why it was done that way but maybe we can handle that in a different MR?

Issue to keep track: #549

theimpulson merged commit da5205c into seedvault-app:android13

1 check passed

theimpulson deleted the android13-dependencyUpdates branch

August 4, 2023 08:41

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels